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 b078ec5..eb21a4c 100644
--- 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 c360e2a..f35debc 100644
--- a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
@@ -65,6 +65,14 @@
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}'
description: 'The target branch of CAPM3 to be used for this test'
@@ -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 43c49bb..963835d 100644
--- 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 4a0c698..4e039ae 100644
--- 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 15c8bc5..28ccb3a 100644
--- 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 0666dfa..0877b75 100644
--- a/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
@@ -65,6 +65,14 @@
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}'
description: 'The target branch of CAPM3 to be used for this test'
@@ -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 77c84ae..58b4d9d 100644
--- 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 35ec772..a7c3eac 100644
--- a/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
@@ -89,10 +89,6 @@
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"
description: 'Select the e2e integration test'
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 19a1241..ef01fe4 100644
--- 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 509f493..c275db2 100644
--- 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"