set default values for PULL_PULL_SHA and PULL_BASE_REF to

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

diff --git a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
index 13f418dde1dfa0db13f93a4dab7bc42872c8e8e0..c85d5b1ef1d4d7865957cc5fa8976beeeda325f9 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_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'
@@ -89,6 +93,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:
@@ -106,7 +114,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True