set default values for PULL_PULL_SHA and PULL_BASE_REF to

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

diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml b/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
index b358892fcb9211aa98d0a82ac809643f2a5796b4..2aff7ba80ccb61fb4183f64d79dc4ddc949fe410 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
@@ -26,8 +26,8 @@
 
 - job-template:
     id: capm3_main_e2e_integration_tests
-    name: '{job_prefix}_daily_main_e2e_integration_test_{image_os}'
-    description: "CAPM3 main e2e integration tests for {repo[org]}/{repo[name]} on {image_os}."
+    name: '{job_prefix}_daily_{capm3_target_branch}_e2e_integration_test_{image_os}'
+    description: "CAPM3 {capm3_version} e2e integration tests for {repo[org]}/{repo[name]} on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -43,7 +43,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -51,7 +51,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
@@ -59,15 +59,19 @@
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: capm3_release_branch
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
-        default: 'v1beta1'
+        default: '{capi_version}'
         description: 'Cluster API version. E.g. v1beta1.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1beta1'
+        default: '{capm3_version}'
         description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
     - string:
         name: TARGET_NODE_MEMORY