From 2483b96735872fa91a4d6a8d7ad6c37d689716cd Mon Sep 17 00:00:00 2001 From: Sunnatillo Date: Fri, 3 May 2024 13:28:44 +0300 Subject: [PATCH] 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 --- jjb/metal3/job_capm3_e2e_basic_tests.yml | 6 +++--- ...ob_capm3_e2e_clusterctl_upgrade_tests_prow.yml | 15 ++++++++++++--- jjb/metal3/job_capm3_e2e_feature_tests_prow.yml | 6 +++--- .../job_capm3_e2e_integration_tests_prow.yml | 6 +++--- .../job_capm3_e2e_k8s_upgrade_tests_prow.yml | 6 +++--- ...periodic_e2e_clusterctl_upgrade_tests_prow.yml | 14 +++++++++++--- .../job_capm3_periodic_e2e_ephemeral_tests.yml | 6 +++--- ...job_capm3_periodic_e2e_feature_tests _prow.yml | 4 ---- ..._capm3_periodic_e2e_integration_tests_prow.yml | 6 +++--- ..._capm3_periodic_e2e_k8s_upgrade_tests_prow.yml | 6 +++--- 10 files changed, 44 insertions(+), 31 deletions(-) diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml index b078ec51a..eb21a4c2b 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 c360e2a67..f35debc68 100644 --- 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 43c49bb6d..963835d44 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 4a0c698b7..4e039ae83 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 15c8bc529..28ccb3a12 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 0666dfaec..0877b75e3 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 @@ -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 77c84aec1..58b4d9d80 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 35ec77228..a7c3eac13 100644 --- 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 19a1241bf..ef01fe442 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 509f49394..c275db23d 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" -- 2.25.1