From 000bc957402fcd965c82d32778a44aa78694ce9c Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Thu, 4 Nov 2021 15:18:46 +0200 Subject: [PATCH] Align master/PR e2e jobs file names, job ids and job names for better readability Change-Id: I0f5815144ab50020e873a2afe4c2f88e66f4a63b --- ... => job_capi_capm3_e2e_v1a5_tests_centos.yml} | 2 +- ... => job_capi_capm3_e2e_v1a5_tests_ubuntu.yml} | 2 +- ... => job_capi_capm3_e2e_v1b1_tests_centos.yml} | 2 +- ... => job_capi_capm3_e2e_v1b1_tests_ubuntu.yml} | 2 +- ..._capi_capm3_master_e2e_v1a5_tests_centos.yml} | 2 +- ..._capi_capm3_master_e2e_v1a5_tests_ubuntu.yml} | 4 ++-- ..._capi_capm3_master_e2e_v1b1_tests_centos.yml} | 2 +- ..._capi_capm3_master_e2e_v1b1_tests_ubuntu.yml} | 2 +- jjb/airship/projects.yml | 16 ++++++++-------- 9 files changed, 17 insertions(+), 17 deletions(-) rename jjb/airship/{job_capi_capm3_v1a5_e2e_tests_centos.yml => job_capi_capm3_e2e_v1a5_tests_centos.yml} (99%) rename jjb/airship/{job_capi_capm3_v1a5_e2e_tests_ubuntu.yml => job_capi_capm3_e2e_v1a5_tests_ubuntu.yml} (99%) rename jjb/airship/{job_capi_capm3_v1b1_e2e_tests_centos.yml => job_capi_capm3_e2e_v1b1_tests_centos.yml} (99%) rename jjb/airship/{job_capi_capm3_v1b1_e2e_tests_ubuntu.yml => job_capi_capm3_e2e_v1b1_tests_ubuntu.yml} (99%) rename jjb/airship/{job_capi_capm3_v1a5_master_e2e_tests_centos.yml => job_capi_capm3_master_e2e_v1a5_tests_centos.yml} (98%) rename jjb/airship/{job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml => job_capi_capm3_master_e2e_v1a5_tests_ubuntu.yml} (97%) rename jjb/airship/{job_capi_capm3_v1b1_master_e2e_tests_centos.yml => job_capi_capm3_master_e2e_v1b1_tests_centos.yml} (98%) rename jjb/airship/{job_capi_capm3_v1b1_master_e2e_tests_ubuntu.yml => job_capi_capm3_master_e2e_v1b1_tests_ubuntu.yml} (98%) 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 02ae8bf5..c9540dca 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 3d06bdba..d3578d33 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 22560877..47b11a37 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 3864f35f..ce505dd8 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 beb10edb..5dca4e67 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 8ea3262d..eef301fd 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 60aff103..56b2a9c4 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 c376bfe8..b2096517 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 ea6a5423..bcc2d6e9 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: -- 2.25.1