metal3: Parameterize version and reorganize projects

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

diff --git a/jjb/metal3/job_capm3_v1b1_integration_tests.yml b/jjb/metal3/job_integration_tests.yml
similarity index 84%
rename from jjb/metal3/job_capm3_v1b1_integration_tests.yml
rename to jjb/metal3/job_integration_tests.yml
index 26ef8aef0045288fb4f362087ab31e472f0c9838..c8e52af9ad84d35b4f2bf44692b4aa234b10baee 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_integration_tests.yml
+++ b/jjb/metal3/job_integration_tests.yml
@@ -25,9 +25,9 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1b1_integration_tests
-    name: '{job_prefix}_{name}_v1b1_integration_test_{image_os}'
-    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on {image_os}."
+    id: integration_tests
+    name: '{job_prefix}_{proj}_{version}_integration_test_{image_os}'
+    description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -35,11 +35,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
@@ -47,7 +47,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
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
-        default: 'v1beta1'
+        default: '{capi_version}'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1beta1'
+        default: '{capm3_version}'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_MEMORY
@@ -77,7 +77,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:
@@ -86,17 +86,15 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-v1b1-{image_os}-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-{version}-{image_os}-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         permit-all: False
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
-        white-list-target-branches:
-          - 'master'
-          - 'main'
-        status-context: "test-v1b1-{image_os}-integration"
+        white-list-target-branches: "{target_branches}"
+        status-context: "test-{version}-{image_os}-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"