set default values for PULL_PULL_SHA and PULL_BASE_REF to

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

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test.yml b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
index 4ff6dc2c2e9d581c8127f3cb12c4f1aeb71f6801..031698a9de45f426de25862c33562d0644e05b25 100644 (file)
--- a/jjb/metal3/job_metal3_dev_tools_integration_test.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
@@ -44,7 +44,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -52,7 +52,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
@@ -72,7 +72,7 @@
         description: 'RAM size of the target host.'
     - string:
         name: KUBERNETES_VERSION
-        default: "v1.23.3"
+        default: ""
         description: 'Kubernetes version'
 
     properties:
@@ -91,7 +91,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-dev-tools-{image_os}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-integration-metal3-dev-tools-{image_os}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -99,7 +99,6 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
-          - 'master'
           - 'main'
         status-context: "test-integration-metal3-dev-tools-{image_os}"
         success-status: "Passed"
@@ -112,7 +111,7 @@
           url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
-            - '{branch|master}'
+            - '{branch|main}'
           name: 'origin'
           refspec: '+refs/heads/*:refs/remotes/origin/*'
           wipe-workspace: True