X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;fp=jjb%2Fairship%2Fprojects.yml;h=b02493465cc547a34da29c1662c32aca455f378b;hb=b1e99615c243202c48834e3e3a98fefb05a2c3de;hp=08ae3652adc22e5d6a5b806799cd3bb8b53a556e;hpb=9e37aa61ad8a82f78cd1f7e15e62a68e593a1f5f;p=infra%2Fcicd.git

diff --git a/jjb/airship/projects.yml b/jjb/metal3/projects.yml
similarity index 70%
rename from jjb/airship/projects.yml
rename to jjb/metal3/projects.yml
index 08ae3652..b0249346 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -21,7 +21,7 @@
 
 # Description:
 # ============
-# This file contains the list of JJB projects in airship category. Each project
+# This file contains the list of JJB projects in metal3 category. Each project
 # corresponds to a github repository. Under each project's 'jobs' list defines the
 # jobs associated with that github repository. The job definitions can be found
 # in job_{job_id}.yml files in any of JJB include folders.
@@ -30,7 +30,7 @@
     name: 'nordix_dev_tools'
     branch: '${{ghprbActualCommit}}'
     ci_github_whitelist_org:
-    - nordix-airship
+    - nordix-metal3
     jobs:
     - linter_tests
     - openstack_image_building
@@ -40,15 +40,15 @@
     - openstack_node_image_building
     - openstack_ipa_and_ironic_image_building
     - metal3_ipa_and_ironic_image_building_test
-    - airship_integration_test_centos
-    - airship_integration_test_ubuntu
+    - metal3_dev_tools_integration_test_centos
+    - metal3_dev_tools_integration_test_ubuntu
     - artifactory_cleanup
     repo:
       org: "Nordix"
-      name: "airship-dev-tools"
+      name: "metal3-dev-tools"
     ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
     ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
-    ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
+    ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
 
 - project:
     name: 'metal3io_project_infra'
@@ -58,10 +58,10 @@
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
-    - capi_bm_v1a4_integration_tests_centos
-    - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_centos
-    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - feature_tests_ubuntu
@@ -88,10 +88,10 @@
       org: "metal3-io"
       name: "baremetal-operator"
     jobs:
-    - capi_bm_v1a4_integration_tests_centos
-    - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_centos
-    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
@@ -106,10 +106,10 @@
       org: "metal3-io"
       name: "ip-address-manager"
     jobs:
-    - capi_bm_v1a4_integration_tests_centos
-    - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_centos
-    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
@@ -120,14 +120,14 @@
 - project:
     name: "metal3io_metal3_dev_env"
     jobs:
-    - capi_bm_v1a4_integration_tests_centos
-    - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a4_master_integration_tests_centos
-    - capi_bm_v1a4_master_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_centos
-    - capi_bm_v1a5_integration_tests_ubuntu
-    - capi_bm_v1a5_master_integration_tests_centos
-    - capi_bm_v1a5_master_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_master_integration_tests_centos
+    - capm3_v1a4_master_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
+    - capm3_v1a5_master_integration_tests_centos
+    - capm3_v1a5_master_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - capm3_v1b1_master_integration_tests_centos
@@ -155,21 +155,21 @@
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
     jobs:
-    - capi_bm_v1a4_integration_tests_centos
-    - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_centos
-    - capi_bm_v1a5_integration_tests_ubuntu
-    - 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_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
+    - capm3_v1a5_e2e_tests_ubuntu
+    - capm3_v1a5_e2e_tests_centos
+    - capm3_v1a5_master_e2e_tests_ubuntu
+    - capm3_v1a5_master_e2e_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_e2e_upgrade_v1b1_tests_ubuntu
-    - capi_capm3_master_e2e_v1b1_tests_centos
-    - capi_capm3_master_e2e_v1b1_tests_ubuntu
+    - capm3_v1b1_e2e_tests_centos
+    - capm3_v1b1_e2e_tests_ubuntu
+    - capm3_v1b1_e2e_upgrade_tests_ubuntu
+    - capm3_v1b1_master_e2e_tests_centos
+    - capm3_v1b1_master_e2e_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
     - keep_v1b1_test_centos_alive
     - keep_v1a5_test_ubuntu_alive
@@ -182,10 +182,10 @@
       org: "metal3-io"
       name: "ironic-image"
     jobs:
-    - capi_bm_v1a4_integration_tests_centos
-    - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_centos
-    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
@@ -199,7 +199,7 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu