Set default NUM_NODES and remove TESTS_FOR var

As e2e and dev env test have sperate pipeline there is no use for
TESTS_FOR variable. Also add default for CAPM3_VERSION and CAPI_VERSION
variable for clusterctl upgrade tests

Change-Id: Ie42714fea463c47101209cae78560e1ac5933391
Signed-off-by: Sunnatillo <sunnat.samadov@est.tech>

diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml
index b078ec51a2853373dd44cadc85b348d3c6bc71e6..eb21a4c2bb3fed8991b35eee060db72b3a2a28bc 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_basic_tests.yml
@@ -83,9 +83,9 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
+        name: NUM_NODES
+        default: 2
+        description: 'Number of libvirt VMs.'
     - string:
         name: GINKGO_FOCUS
         default: "basic"

diff --git a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
index c360e2a67ccddc9eae7f269674632a44a33c2e1c..f35debc6855ecc5ef07dd3696e6f911252190124 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
@@ -64,6 +64,14 @@
         name: IMAGE_OS
         default: "ubuntu"
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version. E.g. v1beta1.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
     - string:
         name: capm3_release_branch
         default: '{capm3_release_branch}'
@@ -77,13 +85,14 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
+        name: NUM_NODES
+        default: 5
+        description: 'Number of libvirt VMs.'
     - string:
         name: GINKGO_FOCUS
         default: "clusterctl-upgrade"
         description: 'Select the e2e upgrade test'
+
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml b/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
index 43c49bb6d0a8f079d81a2906ebd91f687f510a50..963835d44cfdc4968577816c8c59051a7d5c7b25 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
@@ -85,9 +85,9 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
+        name: NUM_NODES
+        default: 4
+        description: 'Number of libvirt VMs.'
     - string:
         name: GINKGO_FOCUS
         default: "features"

diff --git a/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml b/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml
index 4a0c698b71c3ead6a8aa345acc79e318f8ea24ed..4e039ae83def0375c7a9f3d62ab9c0e4774415fa 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml
@@ -85,9 +85,9 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
+        name: NUM_NODES
+        default: 2
+        description: 'Number of libvirt VMs.'
     - string:
         name: GINKGO_FOCUS
         default: "integration"

diff --git a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml
index 15c8bc52906268d9b9d368a2677a0195a39a51b1..28ccb3a1274703e0d9d6010f4cb0af24ac23a8cb 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml
@@ -85,9 +85,9 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
+        name: NUM_NODES
+        default: 4
+        description: 'Number of libvirt VMs.'
     - string:
         name: GINKGO_FOCUS
         default: "k8s-upgrade"

diff --git a/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
index 0666dfaec86e6cee665e7cfa677f57c38fc69353..0877b75e30dc80dafe6da0edc91fda9cf2fb28c5 100644 (file)
--- a/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
@@ -64,6 +64,14 @@
         name: IMAGE_OS
         default: "ubuntu"
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version. E.g. v1beta1.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
     - string:
         name: capm3_release_branch
         default: '{capm3_release_branch}'
@@ -77,9 +85,9 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
+        name: NUM_NODES
+        default: 5
+        description: 'Number of libvirt VMs.'
     - string:
         name: GINKGO_FOCUS
         default: "clusterctl-upgrade"

diff --git a/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
index 77c84aec14c5cdc1247726c11c74c04e3c71f87a..58b4d9d806635149784350ff0ba3dea20ceba0a3 100644 (file)
--- a/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
@@ -85,9 +85,9 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
+        name: NUM_NODES
+        default: 4
+        description: 'Number of libvirt VMs.'
     - bool:
         name: EPHEMERAL_TEST
         default: True

diff --git a/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
index 35ec7722863078267f0ab1a0e1fb7ec42d1e54c5..a7c3eac135d38870c44566ae6a5dc26424771ec3 100644 (file)
--- a/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
@@ -88,10 +88,6 @@
         name: NUM_NODES
         default: 4
         description: 'Number of libvirt VMs.'
-    - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
     - string:
         name: GINKGO_FOCUS
         default: "features"

diff --git a/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
index 19a1241bf8b07b5cb7a3bc69a7fe301a59742485..ef01fe4426964edb50a9cb4ef8a8a95e0bb03281 100644 (file)
--- a/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
@@ -85,9 +85,9 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
+        name: NUM_NODES
+        default: 2
+        description: 'Number of libvirt VMs.'
     - string:
         name: GINKGO_FOCUS
         default: "integration"

diff --git a/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
index 509f49394d1c143bcbd1913a6cdf1e1324c336cf..c275db23de7c043f29f8c80d81d6025c014faaed 100644 (file)
--- a/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
@@ -85,9 +85,9 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
+        name: NUM_NODES
+        default: 4
+        description: 'Number of libvirt VMs.'
     - string:
         name: GINKGO_FOCUS
         default: "k8s-upgrade"