Merge "Update plots: Clean up k6 test suite"

[infra/cicd.git] / jjb / metal3 / job_capm3_e2e_basic_tests.yml

diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml
index ead55d191becd29e19b49a8f28e9f9a2c4e5d808..eb21a4c2bb3fed8991b35eee060db72b3a2a28bc 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_basic_tests.yml
@@ -48,11 +48,11 @@
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
@@ -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"
@@ -112,7 +112,7 @@
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: "jenkins/jobs/prow_integration_tests.pipeline"
+      script-path: "{e2e_tests_pipeline}"
       lightweight-checkout: False
 
 - project:
@@ -130,6 +130,15 @@
             bmo_release_branch: main
             target_branches:
             - 'main'
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            target_branches:
+            - 'main'
+            - 'release-1.7'
+            - 'release-0.6'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1