Merge "Align master/PR e2e jobs file names, job ids and job names for better readability"

[infra/cicd.git] / jjb / airship / projects.yml

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 4d3e04c90a50f49061b943655d59e34f1e707a93..bcc2d6e9aff6897bafa6854da93ae34d599eb9ca 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -69,8 +69,7 @@
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - bml_integration_test_centos
-    - bml_integration_test_ubuntu
+    - bml_integration_tests_centos
 
 - project:
     name: 'metal3io_project_infra_cleanup'
@@ -131,8 +130,8 @@
     - master_feature_tests_ubuntu
     - master_feature_tests_centos
     - master_feature_tests_upgrade_ubuntu
-    - bml_integration_test_centos
-    - bml_integration_test_ubuntu
+    - bml_integration_tests_centos
+    - bml_master_integration_tests_centos
 
     repo:
       org: "metal3-io"
@@ -148,12 +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_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: