summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-09-15 14:23:56 -0400
committerSteve Milner <smilner@redhat.com>2017-09-15 16:35:34 -0400
commit03678b1032881e67bc221d2b26874621d69f0311 (patch)
treee9459b77dd3c07e870b1cd0417cead2d241f1043
parent4109627ae61ae3edc872185963c1e31942d40b79 (diff)
downloadopenshift-03678b1032881e67bc221d2b26874621d69f0311.tar.gz
openshift-03678b1032881e67bc221d2b26874621d69f0311.tar.bz2
openshift-03678b1032881e67bc221d2b26874621d69f0311.tar.xz
openshift-03678b1032881e67bc221d2b26874621d69f0311.zip
testing: Skip net vars on integration tests
Signed-off-by: Steve Milner <smilner@redhat.com>
-rw-r--r--roles/openshift_sanitize_inventory/tasks/main.yml7
-rw-r--r--test/integration/openshift_health_checker/common.go2
2 files changed, 7 insertions, 2 deletions
diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml
index 89bfc011c..47d7be05a 100644
--- a/roles/openshift_sanitize_inventory/tasks/main.yml
+++ b/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"
diff --git a/test/integration/openshift_health_checker/common.go b/test/integration/openshift_health_checker/common.go
index a92d6861d..8b79c48cb 100644
--- a/test/integration/openshift_health_checker/common.go
+++ b/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()