Merge "Add sudo to curl command to download compose script"

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

diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml
index 582e3d3bd6cc642f4a1a81f1c1f7b25ae1204ace..72c3c407d05ccafb5fb67b16028876b7227be947 100644 (file)
--- a/jjb/metal3/job_bml_integration_tests.yml
+++ b/jjb/metal3/job_bml_integration_tests.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,12 +52,20 @@
         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
         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: 'main'
+        description: 'The target branch of CAPM3 to be used for this test'
+    - string:
+        name: bmo_release_branch
+        default: 'main'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'
@@ -70,6 +78,10 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
+    - string:
+        name: NUM_NODES
+        default: 2
+        description: 'Number of baremetal servers.'
 
     properties:
     - build-discarder:
@@ -79,6 +91,11 @@
         artifact-num-to-keep: -1
     - github:
         url: https://github.com/{org}/{repo}
+    - build-blocker:
+        use-build-blocker: true
+        blocking-jobs:
+            - ".*_bml_integration_tests_centos"
+        block-level: 'GLOBAL'
 
     triggers:
     - github-pull-request:
@@ -87,7 +104,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-bml-{image_os}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-integration-bml-{image_os}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True