Add cleanup master job back in CI

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

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index bd4a6cd181649a831b3ed2250df3bc4aec1727bb..f978d9fecd46382999f11db998a00b74afdcec8c 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -38,6 +38,8 @@
     - update_nordix_artifacts
     - update_nordix_repos
     - openstack_node_image_building
+    - openstack_ipa_and_ironic_image_building
+    - metal3_ipa_and_ironic_image_building_test_centos
     repo:
       org: "Nordix"
       name: "airship-dev-tools"
@@ -120,20 +122,7 @@
       name: "project-infra"
     ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     jobs:
-    - capi_bm_master_clean
-
-- project:
-    name: 'metal3io_project_infra_cleanup_test'
-    branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
-    repo:
-      org: "metal3-io"
-      name: "project-infra"
-    ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
-    jobs:
-    - capi_bm_clean
+    - master_clean
 
 - project:
     name: "metal3io_bmo"
@@ -192,6 +181,8 @@
     - 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
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu