metal3: Parameterize version and reorganize projects

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

diff --git a/jjb/metal3/job_capm3_v1b1_main_integration_tests.yml b/jjb/metal3/job_capm3_main_integration_tests.yml
similarity index 87%
rename from jjb/metal3/job_capm3_v1b1_main_integration_tests.yml
rename to jjb/metal3/job_capm3_main_integration_tests.yml
index e63a1698c6bcc488221219cd8c3f056f708153ce..1221a8ba1b14f608169de851dcd008371f763ddd 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_main_integration_tests.yml
+++ b/jjb/metal3/job_capm3_main_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_main_integration_tests
-    name: '{job_prefix}_main_v1b1_integration_test_{image_os}'
-    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on {image_os}."
+    id: capm3_main_integration_tests
+    name: '{job_prefix}_main_{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
@@ -78,7 +78,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 4 * * *"
+      - timed: "{schedule}"
 
     pipeline-scm:
       scm: