From: Furkat Gofurov Date: Fri, 4 Feb 2022 15:18:53 +0000 (+0200) Subject: Rename master mentions in job files and job ids. Also remove 'metal3io-' from project X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F12259%2F1;p=infra%2Fcicd.git 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 0d713e581..3075781d9 100644 --- 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 99713adb3..194ccc2b0 100644 --- 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 847870998..3bee6fbae 100644 --- 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 605079a7b..c4e85bc1d 100644 --- 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 2f6c2bb20..77d76621d 100644 --- 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 b7fac187a..32b7df5e9 100644 --- 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 2f910cc64..79c7e2846 100644 --- 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 7591c02c6..0215f1176 100644 --- 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 ea3b93b5e..868c74300 100644 --- 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 d3c0864cc..2922c3913 100644 --- 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 7b8c2f7dc..def12bbf4 100644 --- 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 a8cac1ce9..f4a642c96 100644 --- 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 598a86d85..2fb39c1f7 100644 --- 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 9a8fcbf8d..8bd3157b2 100644 --- 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 d4cc7a869..ed9b168e9 100644 --- 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 b02493465..1aaa7c7b2 100644 --- 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"