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 02ae8bf59d1de72b3df66eb828ad816f926bc051..c9540dcaef4f824c1dd0b14e6816959c3cd990cf 100644 (file)
--- 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 3d06bdba249738b6d8f2829651e83a594b6daca5..d3578d33c39f1530d200ff011b56d3909cd78f55 100644 (file)
--- 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 22560877186e9ac125969b66e1f616e9041d0e38..47b11a3700eaf40e3d7a07a400b9984bcb473754 100644 (file)
--- 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 3864f35f22e24630aa1abe991069adbb7a4b0fb5..ce505dd816b0d770e44648a625a8162fce293a31 100644 (file)
--- 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 beb10edb4afcb2e2408e808d15f9be5d95032dfa..5dca4e6701945313f267df60ce907ce53065be5b 100644 (file)
--- 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 8ea3262d8f2e2266a2d35c468fd9a40e8dafa1a8..eef301fdc611d40940a6db0ed5e0413abe3463d5 100644 (file)
--- 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 60aff103b93f8046f5828086b0403718caafa644..56b2a9c4f3ba1004412cbf4418823e3a5fd9336b 100644 (file)
--- 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 c376bfe8ba0476b2d20bbb148141bcc400bab80b..b2096517f0e20b5148bd9cfb175e7d0d81a95458 100644 (file)
--- 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 ea6a5423b9aa0c4d71907093538163fdeded9e8c..bcc2d6e9aff6897bafa6854da93ae34d599eb9ca 100644 (file)
--- 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: