Rename master mentions in job files and job ids. Also remove 'metal3io-' from project

names to avoid consequitive 'metal3' wordings in job names in Jenkins UI

Change-Id: I3563ac91f4cbc0c4ad31723503c9ab87963f2bad

diff --git a/jjb/metal3/job_bml_master_integration_tests_centos.yml b/jjb/metal3/job_bml_main_integration_tests_centos.yml
similarity index 97%
rename from jjb/metal3/job_bml_master_integration_tests_centos.yml
rename to jjb/metal3/job_bml_main_integration_tests_centos.yml
index 0d713e5811899d8a82fd07fb9b3a2db92922d2e1..3075781d9bd7e9200a15ec025579b6b494d5b1e7 100644 (file)
--- a/jjb/metal3/job_bml_master_integration_tests_centos.yml
+++ b/jjb/metal3/job_bml_main_integration_tests_centos.yml
@@ -26,8 +26,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: bml_master_integration_tests_centos
-    name: '{job_prefix}_master_bml_integration_tests_centos'
+    id: bml_main_integration_tests_centos
+    name: '{job_prefix}_main_bml_integration_tests_centos'
     description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1a4_master_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml
similarity index 96%
rename from jjb/metal3/job_capm3_v1a4_master_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml
index 99713adb367abc58091ac24d10dfef1a51f2488c..194ccc2b0f711f0768ea9734a2531d7d743a8dfe 100644 (file)
--- a/jjb/metal3/job_capm3_v1a4_master_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1a4_master_integration_tests_centos
-    name: '{job_prefix}_master_v1a4_integration_test_centos'
+    id: capm3_v1a4_main_integration_tests_centos
+    name: '{job_prefix}_main_v1a4_integration_test_centos'
     description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1a4_master_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml
similarity index 96%
rename from jjb/metal3/job_capm3_v1a4_master_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml
index 84787099893eb7a3ee98c66b962b3b7ee9e8e7ea..3bee6fbaeb6cee68c2232ec78a88a2d1fb226a33 100644 (file)
--- a/jjb/metal3/job_capm3_v1a4_master_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1a4_master_integration_tests_ubuntu
-    name: '{job_prefix}_master_v1a4_integration_test_ubuntu'
+    id: capm3_v1a4_main_integration_tests_ubuntu
+    name: '{job_prefix}_main_v1a4_integration_test_ubuntu'
     description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1a5_master_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml
similarity index 97%
rename from jjb/metal3/job_capm3_v1a5_master_e2e_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml
index 605079a7bf9e25079cb534b7caf133d9c390f161..c4e85bc1d0c8a1a5f10285a0b7c0d19f57556a83 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_master_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1a5_master_e2e_tests_centos
-    name: '{job_prefix}_master_v1a5_e2e_test_centos'
+    id: capm3_v1a5_main_e2e_tests_centos
+    name: '{job_prefix}_main_v1a5_e2e_test_centos'
     description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1a5_master_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml
similarity index 97%
rename from jjb/metal3/job_capm3_v1a5_master_e2e_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml
index 2f6c2bb2090bbd09f851d54592a073e6b525ccf6..77d76621da63a76831d3b1ac41cb2678d274eb3b 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_master_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1a5_master_e2e_tests_ubuntu
-    name: '{job_prefix}_master_v1a5_e2e_test_ubuntu'
+    id: capm3_v1a5_main_e2e_tests_ubuntu
+    name: '{job_prefix}_main_v1a5_e2e_test_ubuntu'
     description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1a5_master_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml
similarity index 96%
rename from jjb/metal3/job_capm3_v1a5_master_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml
index b7fac187a8382965d741a6ba2308de96105f6089..32b7df5e9b8fdc300264a177af5a7ea58de2342f 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_master_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1a5_master_integration_tests_centos
-    name: '{job_prefix}_master_v1a5_integration_test_centos'
+    id: capm3_v1a5_main_integration_tests_centos
+    name: '{job_prefix}_main_v1a5_integration_test_centos'
     description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1a5_master_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml
similarity index 96%
rename from jjb/metal3/job_capm3_v1a5_master_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml
index 2f910cc646b5d1e6907044f637e5800d1236675e..79c7e28464a12f6f929e1ffb6f178a9b0a4a4d23 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_master_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1a5_master_integration_tests_ubuntu
-    name: '{job_prefix}_master_v1a5_integration_test_ubuntu'
+    id: capm3_v1a5_main_integration_tests_ubuntu
+    name: '{job_prefix}_main_v1a5_integration_test_ubuntu'
     description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1b1_master_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml
similarity index 97%
rename from jjb/metal3/job_capm3_v1b1_master_e2e_tests_centos.yml
rename to jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml
index 7591c02c67501b684ccdfbf388c42befe3ede322..0215f11769e82e29d7abd3479b308cdc68f6fe73 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_master_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1b1_master_e2e_tests_centos
-    name: '{job_prefix}_master_v1b1_e2e_test_centos'
+    id: capm3_v1b1_main_e2e_tests_centos
+    name: '{job_prefix}_main_v1b1_e2e_test_centos'
     description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1b1_master_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml
similarity index 97%
rename from jjb/metal3/job_capm3_v1b1_master_e2e_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml
index ea3b93b5e888914f8f73287ff841d841825c7f59..868c7430018612498f3ccba3bfe5ee4d183146cf 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_master_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1b1_master_e2e_tests_ubuntu
-    name: '{job_prefix}_master_e2e_v1b1_test_ubuntu'
+    id: capm3_v1b1_main_e2e_tests_ubuntu
+    name: '{job_prefix}_main_e2e_v1b1_test_ubuntu'
     description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1b1_master_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml
similarity index 95%
rename from jjb/metal3/job_capm3_v1b1_master_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml
index d3c0864ccee46bbaed0e7edfa316eeaf8ea10b90..2922c3913cd8a13fadef434c158b0229df8693b2 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_master_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml
@@ -20,13 +20,13 @@
 
 # Description:
 # ============
-# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 master integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 main integration tests.
 # This job can be triggered manually or through a Github pull request. It creates a
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1b1_master_integration_tests_centos
-    name: '{job_prefix}_master_v1b1_integration_test_centos'
+    id: capm3_v1b1_main_integration_tests_centos
+    name: '{job_prefix}_main_v1b1_integration_test_centos'
     description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_v1b1_master_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml
similarity index 95%
rename from jjb/metal3/job_capm3_v1b1_master_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml
index 7b8c2f7dc7d2548f29803c3c46d9befcba8ecbe2..def12bbf47a534895ff4cf5e05d881a815838c9d 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_master_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml
@@ -20,13 +20,13 @@
 
 # Description:
 # ============
-# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 master integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 main integration tests.
 # This job can be triggered manually or through a Github pull request. It creates a
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_v1b1_master_integration_tests_ubuntu
-    name: '{job_prefix}_master_v1b1_integration_test_ubuntu'
+    id: capm3_v1b1_main_integration_tests_ubuntu
+    name: '{job_prefix}_main_v1b1_integration_test_ubuntu'
     description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_master_clean.yml b/jjb/metal3/job_main_clean.yml
similarity index 95%
rename from jjb/metal3/job_master_clean.yml
rename to jjb/metal3/job_main_clean.yml
index a8cac1ce9c6b076de3c01d0e920ef8ba5cb69c9b..f4a642c963a217917ddd2760f4407fcb30bee89f 100644 (file)
--- a/jjb/metal3/job_master_clean.yml
+++ b/jjb/metal3/job_main_clean.yml
@@ -26,8 +26,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: master_clean
-    name: '{job_prefix}_master_integration_tests_cleanup'
+    id: main_clean
+    name: '{job_prefix}_main_integration_tests_cleanup'
     description: "K8s CAPM3 integration tests cleanup"
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_master_feature_tests_centos.yml b/jjb/metal3/job_main_feature_tests_centos.yml
similarity index 97%
rename from jjb/metal3/job_master_feature_tests_centos.yml
rename to jjb/metal3/job_main_feature_tests_centos.yml
index 598a86d85a0989ad31874dd131bda7513f9af06a..2fb39c1f7a89c1fcb426a2f9180a804be23bdd39 100644 (file)
--- a/jjb/metal3/job_master_feature_tests_centos.yml
+++ b/jjb/metal3/job_main_feature_tests_centos.yml
@@ -26,8 +26,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: master_feature_tests_centos
-    name: '{job_prefix}_master_feature_tests_centos'
+    id: main_feature_tests_centos
+    name: '{job_prefix}_main_feature_tests_centos'
     description: "Pivoting and Remediation tests on Centos. "
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_master_feature_tests_ubuntu.yml b/jjb/metal3/job_main_feature_tests_ubuntu.yml
similarity index 97%
rename from jjb/metal3/job_master_feature_tests_ubuntu.yml
rename to jjb/metal3/job_main_feature_tests_ubuntu.yml
index 9a8fcbf8dcfec2ab4083f66643ee6d1714a868e5..8bd3157b2ffbc27382c277d1d4cfa87a3cc1dc63 100644 (file)
--- a/jjb/metal3/job_master_feature_tests_ubuntu.yml
+++ b/jjb/metal3/job_main_feature_tests_ubuntu.yml
@@ -26,8 +26,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: master_feature_tests_ubuntu
-    name: '{job_prefix}_master_feature_tests_ubuntu'
+    id: main_feature_tests_ubuntu
+    name: '{job_prefix}_main_feature_tests_ubuntu'
     description: "Pivoting and Remediation tests on Ubuntu. "
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
similarity index 97%
rename from jjb/metal3/job_master_feature_tests_upgrade_ubuntu.yml
rename to jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
index d4cc7a8691e90d134adbfb5c583a9b5f4df29787..ed9b168e90e83be556cbc148af999bc02c08f284 100644 (file)
--- a/jjb/metal3/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
@@ -26,8 +26,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: master_feature_tests_upgrade_ubuntu
-    name: '{job_prefix}_master_feature_tests_upgrade_ubuntu'
+    id: main_feature_tests_upgrade_ubuntu
+    name: '{job_prefix}_main_feature_tests_upgrade_ubuntu'
     description: "Upgrade tests on Ubuntu. "
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index b02493465cc547a34da29c1662c32aca455f378b..1aaa7c7b2864aa96e246e6585c1ca67558c6683c 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -51,7 +51,7 @@
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
 
 - project:
-    name: 'metal3io_project_infra'
+    name: 'project_infra'
     branch: '${{ghprbActualCommit}}'
     repo:
       org: "metal3-io"
@@ -74,16 +74,16 @@
     - keep_v1a5_test_centos_alive
 
 - project:
-    name: 'metal3io_project_infra_cleanup'
+    name: 'project_infra_cleanup'
     repo:
       org: "metal3-io"
       name: "project-infra"
     ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     jobs:
-    - master_clean
+    - main_clean
 
 - project:
-    name: "metal3io_bmo"
+    name: "bmo"
     repo:
       org: "metal3-io"
       name: "baremetal-operator"
@@ -101,7 +101,7 @@
     - feature_tests_ubuntu
 
 - project:
-    name: "metal3io_ipam"
+    name: "ipam"
     repo:
       org: "metal3-io"
       name: "ip-address-manager"
@@ -118,28 +118,28 @@
     - keep_v1a5_test_centos_alive
 
 - project:
-    name: "metal3io_metal3_dev_env"
+    name: "metal3_dev_env"
     jobs:
     - capm3_v1a4_integration_tests_centos
     - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a4_master_integration_tests_centos
-    - capm3_v1a4_master_integration_tests_ubuntu
+    - capm3_v1a4_main_integration_tests_centos
+    - capm3_v1a4_main_integration_tests_ubuntu
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1a5_master_integration_tests_centos
-    - capm3_v1a5_master_integration_tests_ubuntu
+    - capm3_v1a5_main_integration_tests_centos
+    - capm3_v1a5_main_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
-    - capm3_v1b1_master_integration_tests_centos
-    - capm3_v1b1_master_integration_tests_ubuntu
+    - capm3_v1b1_main_integration_tests_centos
+    - capm3_v1b1_main_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - master_feature_tests_ubuntu
-    - master_feature_tests_centos
-    - master_feature_tests_upgrade_ubuntu
+    - main_feature_tests_ubuntu
+    - main_feature_tests_centos
+    - main_feature_tests_upgrade_ubuntu
     - bml_integration_tests_centos
-    - bml_master_integration_tests_centos
+    - bml_main_integration_tests_centos
     - keep_v1b1_test_ubuntu_alive
     - keep_v1b1_test_centos_alive
     - keep_v1a5_test_ubuntu_alive
@@ -150,7 +150,7 @@
       name: "metal3-dev-env"
 
 - project:
-    name: "metal3io_capi_m3"
+    name: "capm3"
     repo:
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
@@ -161,15 +161,15 @@
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1a5_e2e_tests_ubuntu
     - capm3_v1a5_e2e_tests_centos
-    - capm3_v1a5_master_e2e_tests_ubuntu
-    - capm3_v1a5_master_e2e_tests_centos
+    - capm3_v1a5_main_e2e_tests_ubuntu
+    - capm3_v1a5_main_e2e_tests_centos
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - capm3_v1b1_e2e_tests_centos
     - capm3_v1b1_e2e_tests_ubuntu
     - capm3_v1b1_e2e_upgrade_tests_ubuntu
-    - capm3_v1b1_master_e2e_tests_centos
-    - capm3_v1b1_master_e2e_tests_ubuntu
+    - capm3_v1b1_main_e2e_tests_centos
+    - capm3_v1b1_main_e2e_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
     - keep_v1b1_test_centos_alive
     - keep_v1a5_test_ubuntu_alive
@@ -177,7 +177,7 @@
 
 
 - project:
-    name: "metal3io_ironic_image"
+    name: "ironic_image"
     repo:
       org: "metal3-io"
       name: "ironic-image"
@@ -194,7 +194,7 @@
     - keep_v1a5_test_centos_alive
 
 - project:
-    name: "metal3io_ironic_ipa_downloader"
+    name: "ironic_ipa_downloader"
     repo:
       org: "metal3-io"
       name: "ironic-ipa-downloader"