summaryrefslogtreecommitdiff
path: root/testprogs
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2017-12-18 12:30:44 +1300
committerGarming Sam <garming@samba.org>2017-12-20 23:13:12 +0100
commitc4895cfd9ae77b980ed47d0e08d9b19d850a9e65 (patch)
tree95a7bb51dcb91e2ad681dfb8f5df26be18edd389 /testprogs
parentaee8464aaa01a1740eeab6e47d76621d8e7c740c (diff)
downloadsamba-c4895cfd9ae77b980ed47d0e08d9b19d850a9e65.tar.gz
upgradeprovision: Mark tests as passing again (using functional prep)
Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'testprogs')
-rwxr-xr-xtestprogs/blackbox/upgradeprovision-oldrelease.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh
index a4a0746b308..8d84457bc17 100755
--- a/testprogs/blackbox/upgradeprovision-oldrelease.sh
+++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh
@@ -84,9 +84,15 @@ upgradeprovision() {
# on top of this, also apply 2008R2 changes we accidentally missed in the past
$BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --ldf-file=samba-4.7-missing-for-schema45.ldif,fix-forest-rev.ldf
+
+ # add missing domain prep for 2008R2
+ $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --domain --function-level 2008_R2
}
upgradeprovision_full() {
+ # add missing domain prep for 2008R2
+ $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/${RELEASE}_upgrade_full/private/sam.ldb --domain --function-level 2008_R2
+
$PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX_ABS/${RELEASE}_upgrade_full/etc/smb.conf" --full --debugchange
}