Pārlūkot izejas kodu

testing: Skip net vars on integration tests

Signed-off-by: Steve Milner <smilner@redhat.com>
Steve Milner 7 gadi atpakaļ
vecāks
revīzija
03678b1032

+ 6 - 1
roles/openshift_sanitize_inventory/tasks/main.yml

@@ -14,8 +14,13 @@
 
 # osm_cluster_network_cidr, osm_host_subnet_length and openshift_portal_net are
 # now required to avoid changes that may occur between releases
+#
+# Note: We will skip these checks when some tests run which don't
+# actually do any insalling/upgrading/scaling/etc..
 # Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1451023
-- assert:
+- when:
+    - not testing_skip_some_requirements|default(False)|bool
+  assert:
     that:
       - "osm_cluster_network_cidr is defined"
       - "osm_host_subnet_length is defined"

+ 1 - 1
test/integration/openshift_health_checker/common.go

@@ -25,7 +25,7 @@ func (p PlaybookTest) Run(t *testing.T) {
 	// A PlaybookTest is intended to be run in parallel with other tests.
 	t.Parallel()
 
-	cmd := exec.Command("ansible-playbook", "-i", "/dev/null", p.Path)
+	cmd := exec.Command("ansible-playbook", "-e", "testing_skip_some_requirements=1", "-i", "/dev/null", p.Path)
 	cmd.Env = append(os.Environ(), "ANSIBLE_FORCE_COLOR=1")
 	b, err := cmd.CombinedOutput()