Skip upgrade test when running feature e2e

Change-Id: Ifddf75449b2e81fffa8d74daabcca7870fda17ee

diff --git a/jjb/metal3/job_capm3_e2e_tests.yml b/jjb/metal3/job_capm3_e2e_tests.yml
index b74841bf4fe7d5563e727196e4a9557b495660f3..2cf506a1399054d9f572c29cb4c54d927605cdbb 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_tests.yml
@@ -77,7 +77,11 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-
+    - string:
+        name: GINKGO_SKIP
+        default: "upgrade"
+        description: 'Skip the e2e upgrade test'
+        
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml b/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
index 2b516871ae057036a260d550a4a0024b3867cbc9..36a625834482d7875ee284d7d385e9965a8aa177 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
@@ -81,6 +81,10 @@
         name: EPHEMERAL_TEST
         default: True
         description: 'Select the e2e test in ephemeral cluster'
+    - string:
+        name: GINKGO_SKIP
+        default: "upgrade"
+        description: 'Skip the e2e upgrade test'
 
     properties:
     - build-discarder:

diff --git a/jjb/metal3/job_capm3_main_e2e_tests.yml b/jjb/metal3/job_capm3_main_e2e_tests.yml
index 40755f4c38f311b71cb296578c7110c89cc7aaa7..1a0916056891c12926e1b45ee0b741c2a42c635e 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_tests.yml
@@ -81,7 +81,11 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-
+    - string:
+        name: GINKGO_SKIP
+        default: "upgrade"
+        description: 'Skip the e2e upgrade test'
+        
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_keep_capm3_e2e_tests.yml b/jjb/metal3/job_keep_capm3_e2e_tests.yml
index 5a55058a1c65592da74abf88ac211a285b84161c..8d39a0a3b87794346b3fba01fc6926cb1195143d 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_tests.yml
@@ -81,6 +81,10 @@
         name: SKIP_DELETION
         default: 'true'
         description: 'Whether tester VM should be deleted or not by the end of the test'
+    - string:
+        name: GINKGO_SKIP
+        default: "upgrade"
+        description: 'Skip the e2e upgrade test'
 
     properties:
     - build-discarder: