X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fjob_capm3_e2e_basic_tests.yml;h=eb21a4c2bb3fed8991b35eee060db72b3a2a28bc;hb=HEAD;hp=05f89af4ff28bb3d3d3152e99d53604773ab22ec;hpb=c205195470ef4a5c91eb6663b0b7fa653cd74175;p=infra%2Fcicd.git

diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml
index 05f89af4..eb21a4c2 100644
--- 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"
@@ -103,16 +103,16 @@
     pipeline-scm:
       scm:
       - git:
-          url: "https://github.com/Nordix/metal3-project-infra.git"
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
-            - 'fetch-changes-from-pr-id/mboukhalfa'
+            - '{branch|main}'
           name: 'origin'
           refspec: '+refs/heads/*:refs/remotes/origin/*'
           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