From: Feruzjon Muyassarov Date: Wed, 10 Nov 2021 14:20:52 +0000 (+0000) Subject: Merge "Align master/PR e2e jobs file names, job ids and job names for better readability" X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=b12dd2e4d66cafbf45f627c613f46c623d16952f;hp=9f2153c191f673050403208be869ad6be4d01af5;p=infra%2Fcicd.git Merge "Align master/PR e2e jobs file names, job ids and job names for better readability" --- diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_e2e_v1a5_tests_centos.yml similarity index 99% rename from jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml rename to jjb/airship/job_capi_capm3_e2e_v1a5_tests_centos.yml index 02ae8bf59..c9540dcae 100644 --- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml +++ b/jjb/airship/job_capi_capm3_e2e_v1a5_tests_centos.yml @@ -25,7 +25,7 @@ # pipeline job. The pipeline scripts are maintained in Airship CI repository. - job-template: - id: capi_capm3_v1a5_e2e_tests_centos + id: capi_capm3_e2e_v1a5_tests_centos name: '{job_prefix}_{name}_v1a5_e2e_test_centos' description: "K8s CAPI metal3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS. " project-type: pipeline diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_e2e_v1a5_tests_ubuntu.yml similarity index 99% rename from jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml rename to jjb/airship/job_capi_capm3_e2e_v1a5_tests_ubuntu.yml index 3d06bdba2..d3578d33c 100644 --- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml +++ b/jjb/airship/job_capi_capm3_e2e_v1a5_tests_ubuntu.yml @@ -25,7 +25,7 @@ # pipeline job. The pipeline scripts are maintained in Airship CI repository. - job-template: - id: capi_capm3_v1a5_e2e_tests_ubuntu + id: capi_capm3_e2e_v1a5_tests_ubuntu name: '{job_prefix}_{name}_v1a5_e2e_test_ubuntu' description: "K8s CAPI metal3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu. " project-type: pipeline diff --git a/jjb/airship/job_capi_capm3_v1b1_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_e2e_v1b1_tests_centos.yml similarity index 99% rename from jjb/airship/job_capi_capm3_v1b1_e2e_tests_centos.yml rename to jjb/airship/job_capi_capm3_e2e_v1b1_tests_centos.yml index 225608771..47b11a370 100644 --- a/jjb/airship/job_capi_capm3_v1b1_e2e_tests_centos.yml +++ b/jjb/airship/job_capi_capm3_e2e_v1b1_tests_centos.yml @@ -25,7 +25,7 @@ # pipeline job. The pipeline scripts are maintained in Airship CI repository. - job-template: - id: capi_capm3_v1b1_e2e_tests_centos + id: capi_capm3_e2e_v1b1_tests_centos name: '{job_prefix}_{name}_v1b1_e2e_test_centos' description: "K8s CAPI metal3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS. " project-type: pipeline diff --git a/jjb/airship/job_capi_capm3_v1b1_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_e2e_v1b1_tests_ubuntu.yml similarity index 99% rename from jjb/airship/job_capi_capm3_v1b1_e2e_tests_ubuntu.yml rename to jjb/airship/job_capi_capm3_e2e_v1b1_tests_ubuntu.yml index 3864f35f2..ce505dd81 100644 --- a/jjb/airship/job_capi_capm3_v1b1_e2e_tests_ubuntu.yml +++ b/jjb/airship/job_capi_capm3_e2e_v1b1_tests_ubuntu.yml @@ -25,7 +25,7 @@ # pipeline job. The pipeline scripts are maintained in Airship CI repository. - job-template: - id: capi_capm3_v1b1_e2e_tests_ubuntu + id: capi_capm3_e2e_v1b1_tests_ubuntu name: '{job_prefix}_{name}_v1b1_e2e_test_ubuntu' description: "K8s CAPI metal3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on Ubuntu. " project-type: pipeline diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_centos.yml similarity index 98% rename from jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml rename to jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_centos.yml index beb10edb4..5dca4e670 100644 --- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml +++ b/jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_centos.yml @@ -25,7 +25,7 @@ # pipeline job. The pipeline scripts are maintained in metal3 project infra repository. - job-template: - id: capi_capm3_v1a5_master_e2e_tests_centos + id: capi_capm3_master_e2e_v1a5_tests_centos name: '{job_prefix}_master_e2e_v1a5_test_centos' description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_ubuntu.yml similarity index 97% rename from jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml rename to jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_ubuntu.yml index 8ea3262d8..eef301fdc 100644 --- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml +++ b/jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_ubuntu.yml @@ -25,8 +25,8 @@ # pipeline job. The pipeline scripts are maintained in metal3 project infra repository. - job-template: - id: capi_capm3_v1a5_master_e2e_tests_ubuntu - name: '{job_prefix}_master_v1a5_e2e_test_ubuntu' + id: capi_capm3_master_e2e_v1a5_tests_ubuntu + name: '{job_prefix}_master_e2e_v1a5_test_ubuntu' description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global diff --git a/jjb/airship/job_capi_capm3_v1b1_master_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_centos.yml similarity index 98% rename from jjb/airship/job_capi_capm3_v1b1_master_e2e_tests_centos.yml rename to jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_centos.yml index 60aff103b..56b2a9c4f 100644 --- a/jjb/airship/job_capi_capm3_v1b1_master_e2e_tests_centos.yml +++ b/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_centos.yml @@ -25,7 +25,7 @@ # pipeline job. The pipeline scripts are maintained in metal3 project infra repository. - job-template: - id: capi_capm3_v1b1_master_e2e_tests_centos + id: capi_capm3_master_e2e_v1b1_tests_centos name: '{job_prefix}_master_e2e_v1b1_test_centos' description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline diff --git a/jjb/airship/job_capi_capm3_v1b1_master_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_ubuntu.yml similarity index 98% rename from jjb/airship/job_capi_capm3_v1b1_master_e2e_tests_ubuntu.yml rename to jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_ubuntu.yml index c376bfe8b..b2096517f 100644 --- a/jjb/airship/job_capi_capm3_v1b1_master_e2e_tests_ubuntu.yml +++ b/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_ubuntu.yml @@ -25,7 +25,7 @@ # pipeline job. The pipeline scripts are maintained in metal3 project infra repository. - job-template: - id: capi_capm3_v1b1_master_e2e_tests_ubuntu + id: capi_capm3_master_e2e_v1b1_tests_ubuntu name: '{job_prefix}_master_e2e_v1b1_test_ubuntu' description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml index ea6a5423b..bcc2d6e9a 100644 --- a/jjb/airship/projects.yml +++ b/jjb/airship/projects.yml @@ -147,16 +147,16 @@ - capi_bm_v1a4_integration_tests_ubuntu - capi_bm_v1a5_integration_tests_centos - capi_bm_v1a5_integration_tests_ubuntu - - capi_capm3_v1a5_e2e_tests_ubuntu - - capi_capm3_v1a5_e2e_tests_centos - - capi_capm3_v1a5_master_e2e_tests_ubuntu - - capi_capm3_v1a5_master_e2e_tests_centos + - capi_capm3_e2e_v1a5_tests_ubuntu + - capi_capm3_e2e_v1a5_tests_centos + - capi_capm3_master_e2e_v1a5_tests_ubuntu + - capi_capm3_master_e2e_v1a5_tests_centos - capm3_v1b1_integration_tests_centos - capm3_v1b1_integration_tests_ubuntu - - capi_capm3_v1b1_e2e_tests_centos - - capi_capm3_v1b1_e2e_tests_ubuntu - - capi_capm3_v1b1_master_e2e_tests_centos - - capi_capm3_v1b1_master_e2e_tests_ubuntu + - capi_capm3_e2e_v1b1_tests_centos + - capi_capm3_e2e_v1b1_tests_ubuntu + - capi_capm3_master_e2e_v1b1_tests_centos + - capi_capm3_master_e2e_v1b1_tests_ubuntu - project: