Unify jjb naming

Change-Id: I2e85d9822e3421b8b17415ceef9e60384551bb09

diff --git a/jjb/metal3/job_bml_main_integration_tests.yml b/jjb/metal3/job_bml_periodic_integration_tests.yml
similarity index 97%
rename from jjb/metal3/job_bml_main_integration_tests.yml
rename to jjb/metal3/job_bml_periodic_integration_tests.yml
index 121777c48088c30f197b3f717094823e520c54a6..667a326c520f3c025b14899415a16a38f5985a38 100644 (file)
--- a/jjb/metal3/job_bml_main_integration_tests.yml
+++ b/jjb/metal3/job_bml_periodic_integration_tests.yml
@@ -26,8 +26,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: bml_main_integration_tests
-    name: '{job_prefix}_daily_main_bml_integration_tests_{image_os}'
+    id: bml_periodic_integration_tests
+    name: '{job_prefix}_periodic_bml_integration_tests_{image_os}'
     description: "CAPM3 v1beta1 main integration tests for {org}/{repo} on {image_os} in Bare Metal Lab."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
similarity index 96%
rename from jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
index b39038c16bbd0b48f0826467826a04b32d251623..e351b155fef9517f736d48b8e3a8d3ee8c5ba4a4 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_clusterctl_upgrade_tests_prow
-    name: '{job_prefix}-daily-e2e-clusterctl-upgrade-test-{capm3_target_branch}'
+    id: capm3_periodic_e2e_clusterctl_upgrade_tests_prow
+    name: '{job_prefix}-periodic-e2e-clusterctl-upgrade-test-{capm3_target_branch}'
     description: "CAPM e2e clusterctl upgrade tests on ubuntu."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
similarity index 97%
rename from jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
rename to jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
index bce4400c46005dd483787994069b0b5ccb07b56a..632883ec66308d9f071b410c99b593c1f0490b4b 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_ephemeral_tests
-    name: '{job_prefix}_daily_main_e2e_ephemeral_test_{image_os}'
+    id: capm3_periodic_e2e_ephemeral_tests
+    name: '{job_prefix}_periodic_e2e_ephemeral_test_{image_os}'
     description: "CAPM3 v1beta1 e2e tests in ephemeral cluster for {repo[org]}/{repo[name]} on centos."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
similarity index 95%
rename from jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
index 22946c8ef1b01eec2590071e3fad0dfeee688617..35ec7722863078267f0ab1a0e1fb7ec42d1e54c5 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_feature_tests_prow
-    name: '{job_prefix}-daily-{image_os}-e2e-feature-test-{capm3_target_branch}'
+    id: capm3_periodic_e2e_feature_tests_prow
+    name: '{job_prefix}-periodic-{image_os}-e2e-feature-test-{capm3_target_branch}'
     description: "CAPM3 {capm3_version} e2e tests on {image_os}."
     project-type: pipeline
     defaults: global
@@ -50,11 +50,11 @@
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: '{capm3_branch}'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: '{capm3_branch}'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER

diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml b/jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
similarity index 96%
rename from jjb/metal3/job_capm3_main_e2e_integration_tests.yml
rename to jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
index 2aff7ba80ccb61fb4183f64d79dc4ddc949fe410..e6746d4b2a261f8d0cda55e0916696de997d16b0 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_integration_tests
-    name: '{job_prefix}_daily_{capm3_target_branch}_e2e_integration_test_{image_os}'
+    id: capm3_periodic_e2e_integration_tests
+    name: '{job_prefix}_periodic_{capm3_target_branch}_e2e_integration_test_{image_os}'
     description: "CAPM3 {capm3_version} e2e integration tests for {repo[org]}/{repo[name]} on {image_os}."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
similarity index 96%
rename from jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
index ad834a51dfef1a7998934da6d74e2e74f8acf266..d133633700017a70770536b4f984470748d45c97 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_integration_tests_prow
-    name: '{job_prefix}-daily-{image_os}-e2e-integration-test-{capm3_target_branch}'
+    id: capm3_periodic_e2e_integration_tests_prow
+    name: '{job_prefix}-periodic-{image_os}-e2e-integration-test-{capm3_target_branch}'
     description: "CAPM3 {capm3_version} e2e integration tests on {image_os}."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
similarity index 97%
rename from jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
index 8ab6e7a87f48d9cbb5e22329f3fb1a89c03ea7c9..02b2531ed3aed59eac0e29a9b771e393e4e31ac7 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_k8s_upgrade_tests_prow
-    name: '{job_prefix}-daily-e2e-{k8s_versions}-upgrade-{capm3_target_branch}'
+    id: capm3_periodic_e2e_k8s_upgrade_tests_prow
+    name: '{job_prefix}-periodic-e2e-{k8s_versions}-upgrade-{capm3_target_branch}'
     description: "CAPM3 e2e k8s upgrade tests on ubuntu."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_integration_tests.yml b/jjb/metal3/job_capm3_periodic_integration_tests.yml
similarity index 96%
rename from jjb/metal3/job_capm3_main_integration_tests.yml
rename to jjb/metal3/job_capm3_periodic_integration_tests.yml
index b34f57f12d30609c460b2225a40a8e4eb6506b02..b7f1ebe7c528dab161def42ef75717ad8f6f33f8 100644 (file)
--- a/jjb/metal3/job_capm3_main_integration_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_integration_tests.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_integration_tests
-    name: '{job_prefix}_daily_{capm3_target_branch}_integration_test_{image_os}'
+    id: capm3_periodic_integration_tests
+    name: '{job_prefix}_periodic_{capm3_target_branch}_integration_test_{image_os}'
     description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_main_clean.yml b/jjb/metal3/job_periodic_clean.yml
similarity index 95%
rename from jjb/metal3/job_main_clean.yml
rename to jjb/metal3/job_periodic_clean.yml
index 2ad3fa4fd70128d889e888c4dcc194a976e0a4ea..4d17be343bc66dfcd90423360066d26adf913e18 100644 (file)
--- a/jjb/metal3/job_main_clean.yml
+++ b/jjb/metal3/job_periodic_clean.yml
@@ -26,8 +26,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: main_clean
-    name: '{job_prefix}_daily_main_integration_tests_cleanup'
+    id: periodic_clean
+    name: '{job_prefix}_periodic_integration_tests_cleanup'
     description: "CAPM3 integration tests cleanup"
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_main_fullstack_building.yml b/jjb/metal3/job_periodic_fullstack_building.yml
similarity index 98%
rename from jjb/metal3/job_main_fullstack_building.yml
rename to jjb/metal3/job_periodic_fullstack_building.yml
index fbb3ecdb01d96e071c0786b20884f759f5fe2049..2ee904e70ae318ca0925d4751b4f50bd3180973f 100644 (file)
--- a/jjb/metal3/job_main_fullstack_building.yml
+++ b/jjb/metal3/job_periodic_fullstack_building.yml
@@ -25,8 +25,8 @@
 # The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
-    id: main_fullstack_building
-    name: '{job_prefix}_daily_main_fullstack_building'
+    id: periodic_fullstack_building
+    name: '{job_prefix}_daily_periodic_fullstack_building'
     description: "Build and test a Metal3 cluster stack from source."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 5a20c733a9c84c7f4f2d626fd0a085065c799cfe..c3993d023e64f4b08d041f7dcf391dd04c2dbbb8 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -38,7 +38,7 @@
     - openstack_node_image_building
     - docker_image_building
     - update_nordix_repos
-    - main_fullstack_building
+    - periodic_fullstack_building
     - fullstack_building_test
     - metal3_dev_tools_integration_test:
         image_os:
@@ -194,7 +194,7 @@
     - ubuntu
     - centos
     jobs:
-    - capm3_main_integration_tests:
+    - capm3_periodic_integration_tests:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
@@ -234,7 +234,7 @@
             repo: project-infra
             branch: '${{ghprbActualCommit}}'
             ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - bml_main_integration_tests:
+    - bml_periodic_integration_tests:
         repo: metal3-dev-env
 
 - project:
@@ -244,7 +244,7 @@
       name: "project-infra"
     ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     jobs:
-    - main_clean
+    - periodic_clean
 
 - project:
     name: 'project_infra'
@@ -630,7 +630,7 @@
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-    - capm3_main_e2e_integration_tests_prow:
+    - capm3_periodic_e2e_integration_tests_prow:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
@@ -688,33 +688,29 @@
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-    - capm3_main_e2e_feature_tests_prow:
+    - capm3_periodic_e2e_feature_tests_prow:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: main
             capm3_release_branch: main
             bmo_release_branch: main
             schedule: "H 2 * * *"
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: release-1.6
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             schedule: "H 8 * * *"
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: release-1.5
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             schedule: "H 11 * * *"
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: release-1.4
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
             schedule: "H 5 * * *"
@@ -802,7 +798,7 @@
             capm3_target_branch: release-1-4
         exclude:
         - image_os: centos
-    - capm3_main_e2e_clusterctl_upgrade_tests_prow:
+    - capm3_periodic_e2e_clusterctl_upgrade_tests_prow:
         capm3_target_branch:
         - main:
             capm3_release_branch: main
@@ -818,7 +814,7 @@
             bmo_release_branch: release-0.3
         exclude:
         - image_os: centos
-    - capm3_main_e2e_k8s_upgrade_tests_prow:
+    - capm3_periodic_e2e_k8s_upgrade_tests_prow:
         k8s_versions:
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
@@ -928,7 +924,7 @@
         - image_os: centos
 
 - project:
-    name: "capm3-main-tests"
+    name: "capm3-periodic-tests"
     repo:
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
@@ -936,10 +932,10 @@
     - ubuntu
     - centos
     jobs:
-    - capm3_main_e2e_ephemeral_tests:
+    - capm3_periodic_e2e_ephemeral_tests:
         exclude:
         - image_os: ubuntu
-    - capm3_main_e2e_integration_tests:
+    - capm3_periodic_e2e_integration_tests:
         capm3_target_branch:
         - main:
             capi_version: v1beta1