Fix incorrect trigger phrase and add keep jobs to

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

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index eea8de2a58b73cb3fa0a20b3dc7142731ab42d53..d65200f7cd0c9431011bc9dae172aa535af7fd02 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -53,8 +53,6 @@
 - project:
     name: 'metal3io_project_infra'
     branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
     repo:
       org: "metal3-io"
       name: "project-infra"
@@ -64,16 +62,19 @@
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - bml_integration_test_centos
-    - bml_integration_test_ubuntu
+    - bml_integration_tests_centos
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
 
 - project:
     name: 'metal3io_project_infra_cleanup'
-    ci_github_whitelist_org:
-    - nordix-airship
     repo:
       org: "metal3-io"
       name: "project-infra"
@@ -91,6 +92,12 @@
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
     - feature_tests_ubuntu
 
 - project:
@@ -103,6 +110,12 @@
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
 
 - project:
     name: "metal3io_metal3_dev_env"
@@ -115,14 +128,22 @@
     - capi_bm_v1a5_integration_tests_ubuntu
     - capi_bm_v1a5_master_integration_tests_centos
     - capi_bm_v1a5_master_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
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
     - 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
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
 
     repo:
       org: "metal3-io"
@@ -138,10 +159,20 @@
     - 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
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
 
 
 - project:
@@ -154,6 +185,12 @@
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - keep_v1b1_test_ubuntu_alive
+    - keep_v1b1_test_centos_alive
+    - keep_v1a5_test_ubuntu_alive
+    - keep_v1a5_test_centos_alive
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
@@ -163,3 +200,5 @@
     jobs:
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu