metal3: Parameterize version and reorganize projects

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

diff --git a/jjb/metal3/job_bml_integration_tests_centos.yml b/jjb/metal3/job_bml_integration_tests.yml
similarity index 86%
rename from jjb/metal3/job_bml_integration_tests_centos.yml
rename to jjb/metal3/job_bml_integration_tests.yml
index 8e85e169016436ea8c07feb30b968bfb9b23e895..582e3d3bd6cc642f4a1a81f1c1f7b25ae1204ace 100644 (file)
--- a/jjb/metal3/job_bml_integration_tests_centos.yml
+++ b/jjb/metal3/job_bml_integration_tests.yml
@@ -26,9 +26,9 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: bml_integration_tests_centos
-    name: '{job_prefix}_{name}_bml_integration_tests_centos'
-    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
+    id: bml_integration_tests
+    name: '{job_prefix}_{proj}_bml_integration_tests_{image_os}'
+    description: "CAPM3 v1beta1 integration tests for {org}/{repo} on {image_os} in Bare Metal Lab."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -36,11 +36,11 @@
     parameters:
     - string:
         name: PROJECT_REPO_ORG
-        default: '{repo[org]}'
+        default: '{org}'
         description: 'Project github repo org name'
     - string:
         name: PROJECT_REPO_NAME
-        default: '{repo[name]}'
+        default: '{repo}'
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
@@ -48,7 +48,7 @@
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        default: 'https://github.com/{org}/{repo}.git'
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
@@ -56,7 +56,7 @@
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
-        default: 'centos'
+        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: CAPI_VERSION
@@ -78,7 +78,7 @@
         artifact-days-to-keep: -1
         artifact-num-to-keep: -1
     - github:
-        url: https://github.com/{repo[org]}/{repo[name]}
+        url: https://github.com/{org}/{repo}
 
     triggers:
     - github-pull-request:
@@ -87,7 +87,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-bml-centos(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-integration-bml-{image_os}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -97,7 +97,7 @@
         white-list-target-branches:
           - 'master'
           - 'main'
-        status-context: "test-integration-bml-centos"
+        status-context: "test-integration-bml-{image_os}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"