Merging upstream version 2.1.8~rc1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 17 insertions, 36 deletions

diff --git a/cts/cli/regression.upgrade.exp b/cts/cli/regression.upgrade.exp
index d1aeeb5..00ee754 100644
--- a/cts/cli/regression.upgrade.exp
+++ b/cts/cli/regression.upgrade.exp
@@ -57,47 +57,28 @@ A new shadow instance was created. To begin using it, enter the following into y
 =#=#=#= End test: Configure the initial resource - OK (0) =#=#=#=
 * Passed: cibadmin       - Configure the initial resource
 =#=#=#= Begin test: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
-update_validation 	debug: Testing 'pacemaker-2.10' validation (13 of X)
-update_validation 	debug: Upgrading pacemaker-2.10-style configuration to pacemaker-3.0 with upgrade-2.10.xsl
-apply_upgrade 	debug: Upgrading pacemaker-2.10-style configuration, pre-upgrade phase with upgrade-2.10-enter.xsl
-apply_upgrade 	debug: Upgrading pacemaker-2.10-style configuration, main phase with upgrade-2.10.xsl
+pcmk__update_schema 	debug: Schema pacemaker-2.10 validates
+apply_upgrade 	debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying pre-upgrade XSL transform upgrade-2.10-enter
+apply_upgrade 	debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying upgrade XSL transform upgrade-2.10
 INFO: Resources-operation instance_attributes: mySmartFuse-monitor-inputpower (rsc=mySmartFuse, meta=mySmartFuse-inputpower-instanceparams): dropping requires
 INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
 INFO: Resources-operation instance_attributes: mySmartFuse-monitor-outputpower (rsc=mySmartFuse, meta=mySmartFuse-outputpower-instanceparams): dropping requires
 INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
-apply_upgrade 	debug: Upgrading pacemaker-2.10-style configuration, post-upgrade phase with upgrade-2.10-leave.xsl
+apply_upgrade 	debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying post-upgrade XSL transform upgrade-2.10-leave
 DEBUG: instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
-update_validation 	info: Transformation upgrade-2.10.xsl successful
-update_validation 	debug: Testing 'pacemaker-3.0' validation (14 of X)
-update_validation 	debug: pacemaker-3.0-style configuration is also valid for pacemaker-3.1
-update_validation 	debug: Testing 'pacemaker-3.1' validation (15 of X)
-update_validation 	debug: Configuration valid for schema: pacemaker-3.1
-update_validation 	debug: pacemaker-3.1-style configuration is also valid for pacemaker-3.2
-update_validation 	debug: Testing 'pacemaker-3.2' validation (16 of X)
-update_validation 	debug: Configuration valid for schema: pacemaker-3.2
-update_validation 	debug: pacemaker-3.2-style configuration is also valid for pacemaker-3.3
-update_validation 	debug: Testing 'pacemaker-3.3' validation (17 of X)
-update_validation 	debug: Configuration valid for schema: pacemaker-3.3
-update_validation 	debug: pacemaker-3.3-style configuration is also valid for pacemaker-3.4
-update_validation 	debug: Testing 'pacemaker-3.4' validation (18 of X)
-update_validation 	debug: Configuration valid for schema: pacemaker-3.4
-update_validation 	debug: pacemaker-3.4-style configuration is also valid for pacemaker-3.5
-update_validation 	debug: Testing 'pacemaker-3.5' validation (19 of X)
-update_validation 	debug: Configuration valid for schema: pacemaker-3.5
-update_validation 	debug: pacemaker-3.5-style configuration is also valid for pacemaker-3.6
-update_validation 	debug: Testing 'pacemaker-3.6' validation (20 of X)
-update_validation 	debug: Configuration valid for schema: pacemaker-3.6
-update_validation 	debug: pacemaker-3.6-style configuration is also valid for pacemaker-3.7
-update_validation 	debug: Testing 'pacemaker-3.7' validation (21 of X)
-update_validation 	debug: Configuration valid for schema: pacemaker-3.7
-update_validation 	debug: pacemaker-3.7-style configuration is also valid for pacemaker-3.8
-update_validation 	debug: Testing 'pacemaker-3.8' validation (22 of X)
-update_validation 	debug: Configuration valid for schema: pacemaker-3.8
-update_validation 	debug: pacemaker-3.8-style configuration is also valid for pacemaker-3.9
-update_validation 	debug: Testing 'pacemaker-3.9' validation (23 of X)
-update_validation 	debug: Configuration valid for schema: pacemaker-3.9
-update_validation 	trace: Stopping at pacemaker-3.9
-update_validation 	info: Transformed the configuration from pacemaker-2.10 to pacemaker-3.9
+apply_upgrade 	info: Schema upgrade from pacemaker-2.10 to pacemaker-3.0 succeeded
+pcmk__update_schema 	debug: Schema pacemaker-3.0 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.1 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.2 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.3 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.4 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.5 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.6 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.7 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.8 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.9 validates
+pcmk__update_schema 	debug: Schema pacemaker-3.10 validates
+pcmk__update_schema 	info: Transformed the configuration schema to pacemaker-3.10
 =#=#=#= Current cib after: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
 <cib epoch="2" num_updates="0" admin_epoch="1">
   <configuration>