set default values for PULL_PULL_SHA and PULL_BASE_REF to

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

diff --git a/jjb/metal3/job_keep_integration_vm.yml b/jjb/metal3/job_keep_integration_vm.yml
index 49b6712896fb7ff4d2ee1080e14bc294682d63f0..e2ed626ae30f59d6bac3bb6d132949007e751970 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm.yml
+++ b/jjb/metal3/job_keep_integration_vm.yml
@@ -58,6 +58,14 @@
         name: IMAGE_OS
         default: '{image_os}'
         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: '{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: '{capi_version}'
@@ -71,9 +79,9 @@
         default: 4096
         description: 'RAM size of the target host.'
     - string:
-        name: SKIP_DELETION
+        name: KEEP_TEST_ENV
         default: 'true'
-        description: 'Whether tester VM should be deleted or not by the end of the test'
+        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
 
     properties:
     - build-discarder:
@@ -91,7 +99,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-integration-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/keep-test-{image_os}-integration-{capm3_target_branch}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True