diff --git a/cts/cli/cibadmin_invalid_schema.xml b/cts/cli/cibadmin_invalid_schema.xml
new file mode 100644
index 00000000000..24439436b9e
--- /dev/null
+++ b/cts/cli/cibadmin_invalid_schema.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cts/cli/regression.upgrade.exp b/cts/cli/regression.upgrade.exp
index 937c4d30743..905e55a9523 100644
--- a/cts/cli/regression.upgrade.exp
+++ b/cts/cli/regression.upgrade.exp
@@ -1,6 +1,33 @@
+=#=#=#= Begin test: Run cibadmin with upgrade and force flags =#=#=#=
+pcmk__update_schema debug: Schema pacemaker-2.10 validates
+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 debug: Schema pacemaker-4.0 validates
+pcmk__update_schema info: Transformed the configuration schema to pacemaker-4.0
+=#=#=#= Current cib after: Run cibadmin with upgrade and force flags =#=#=#=
+
+
+
+
+
+
+
+
+
+=#=#=#= End test: Run cibadmin with upgrade and force flags - OK (0) =#=#=#=
+* Passed: cibadmin - Run cibadmin with upgrade and force flags
=#=#=#= Begin test: Set stonith-enabled=false =#=#=#=
=#=#=#= Current cib after: Set stonith-enabled=false =#=#=#=
-
+
@@ -17,7 +44,7 @@
* Passed: crm_attribute - Set stonith-enabled=false
=#=#=#= Begin test: Configure the initial resource =#=#=#=
=#=#=#= Current cib after: Configure the initial resource =#=#=#=
-
+
@@ -54,31 +81,8 @@
=#=#=#= 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) =#=#=#=
-pcmk__update_schema debug: Schema pacemaker-2.10 validates
-apply_upgrade debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying XSL transform upgrade-2.10-0.xsl
-apply_upgrade debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying XSL transform upgrade-2.10-1.xsl
-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 schema from pacemaker-2.10 to pacemaker-3.0: applying XSL transform upgrade-2.10-2.xsl
-DEBUG: instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
-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 debug: Schema pacemaker-4.0 validates
-pcmk__update_schema info: Transformed the configuration schema to pacemaker-4.0
=#=#=#= Current cib after: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
-
+
@@ -90,16 +94,22 @@ pcmk__update_schema info: Transformed the configuration schema to pacemaker-4.0
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
@@ -111,7 +121,7 @@ pcmk__update_schema info: Transformed the configuration schema to pacemaker-4.0
=#=#=#= Begin test: Query a resource instance attribute (shall survive) =#=#=#=
outputpower
=#=#=#= Current cib after: Query a resource instance attribute (shall survive) =#=#=#=
-
+
@@ -123,16 +133,22 @@ outputpower
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
diff --git a/cts/cts-cli.in b/cts/cts-cli.in
index 5c05b7e11e8..e5003bc0c79 100644
--- a/cts/cts-cli.in
+++ b/cts/cts-cli.in
@@ -2933,7 +2933,7 @@ class UpgradeRegressionTest(RegressionTest):
@property
def tests(self):
"""A list of Test instances to be run as part of this regression test."""
- resource_cib = """
+ resource_cib1 = """
@@ -2956,13 +2956,63 @@ class UpgradeRegressionTest(RegressionTest):
+"""
+ resource_cib2 = """
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
"""
+ t882_tests3 = [
+ Test("Run cibadmin with upgrade and force flags", "cibadmin -u --force",
+ update_cib=True),
+ ]
+
+ t882_tests0 = [
+ Test("Run cibadmin with upgrade and force flags", "cibadmin -u --force",
+ update_cib=True),
+ ]
+
+ t882_tests1 = [
+ Test("Run cibadmin with upgrade and force flags", "cibadmin -u --force -x '{cts_cli_data}/cibadmin_invalid_schema.xml'",
+ update_cib=True),
+ ]
+
+ t882_tests2 = [
+ Test("Run cibadmin with upgrade and force flags", "cibadmin -u --force -p",
+ update_cib=True, stdin=resource_cib2),
+ ]
+
basic_tests = [
+
+ TestGroup(t882_tests3,
+ env={"CIB_file": "{cts_cli_data}/cibadmin_invalid_schema.xml"}),
+
Test("Set stonith-enabled=false", "crm_attribute -n stonith-enabled -v false",
update_cib=True),
Test("Configure the initial resource", "cibadmin -M -o resources -p",
- update_cib=True, stdin=resource_cib),
+ update_cib=True, stdin=resource_cib1),
Test("Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping)",
"cibadmin --upgrade --force -V -V",
update_cib=True),