set default values for PULL_PULL_SHA and PULL_BASE_REF to

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

diff --git a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
index 34293df5083e7f5d23fa92c9683af2d2550b82f1..89a991060a35f46913fc0e86f3dc4c1e399147f9 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
@@ -61,6 +61,10 @@
         name: capm3_release_branch
         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'
@@ -93,6 +97,10 @@
         name: KUBERNETES_VERSION_UPGRADE_TO
         default: '{k8s_version_upgrade_to}'
         description: 'Kubernetes version upgrade to'
+    - string:
+        name: KUBECTL_SHA256
+        default: '{kubectl_sha256}'
+        description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION_UPGRADE_FROM'
 
     properties:
     - build-discarder:
@@ -110,7 +118,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-e2e-{k8s_versions}-upgrade-main(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -118,7 +126,7 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches: "{target_branches}"
-        status-context: "keep-test-e2e-{k8s_versions}-upgrade-main"
+        status-context: "keep-test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"