X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;h=070c39969c3b4dd33cfffca89c4a7208a5bbd7be;hb=fba373c23747d6ccc9a53b4ab0364ea61a7b22b8;hp=b02493465cc547a34da29c1662c32aca455f378b;hpb=b1e99615c243202c48834e3e3a98fefb05a2c3de;p=infra%2Fcicd.git

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index b0249346..070c3996 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -35,10 +35,9 @@
     - linter_tests
     - openstack_image_building
     - docker_image_building
-    - update_nordix_artifacts
     - update_nordix_repos
     - openstack_node_image_building
-    - openstack_ipa_and_ironic_image_building
+    - main_openstack_ipa_and_ironic_image_building
     - metal3_ipa_and_ironic_image_building_test
     - metal3_dev_tools_integration_test_centos
     - metal3_dev_tools_integration_test_ubuntu
@@ -51,15 +50,17 @@
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
 
 - project:
-    name: 'metal3io_project_infra'
+    name: 'project_infra'
     branch: '${{ghprbActualCommit}}'
     repo:
       org: "metal3-io"
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -74,22 +75,24 @@
     - keep_v1a5_test_centos_alive
 
 - project:
-    name: 'metal3io_project_infra_cleanup'
+    name: 'project_infra_cleanup'
     repo:
       org: "metal3-io"
       name: "project-infra"
     ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     jobs:
-    - master_clean
+    - main_clean
 
 - project:
-    name: "metal3io_bmo"
+    name: "bmo"
     repo:
       org: "metal3-io"
       name: "baremetal-operator"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -101,13 +104,15 @@
     - feature_tests_ubuntu
 
 - project:
-    name: "metal3io_ipam"
+    name: "ipam"
     repo:
       org: "metal3-io"
       name: "ip-address-manager"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -118,28 +123,30 @@
     - keep_v1a5_test_centos_alive
 
 - project:
-    name: "metal3io_metal3_dev_env"
+    name: "metal3_dev_env"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a4_master_integration_tests_centos
-    - capm3_v1a4_master_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a4_main_integration_tests_centos
+    - capm3_v1a4_main_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_v1a5_main_integration_tests_centos
+    - capm3_v1a5_main_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
+    - capm3_v1b1_main_integration_tests_centos
+    - capm3_v1b1_main_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
+    - main_feature_tests_ubuntu
+    - main_feature_tests_centos
+    - main_feature_tests_upgrade_ubuntu
     - bml_integration_tests_centos
-    - bml_master_integration_tests_centos
+    - bml_main_integration_tests_centos
     - keep_v1b1_test_ubuntu_alive
     - keep_v1b1_test_centos_alive
     - keep_v1a5_test_ubuntu_alive
@@ -150,26 +157,28 @@
       name: "metal3-dev-env"
 
 - project:
-    name: "metal3io_capi_m3"
+    name: "capm3"
     repo:
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - 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_v1a5_main_e2e_tests_ubuntu
+    - capm3_v1a5_main_e2e_tests_centos
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_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
+    - capm3_v1b1_main_e2e_tests_centos
+    - capm3_v1b1_main_e2e_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
     - keep_v1b1_test_centos_alive
     - keep_v1a5_test_ubuntu_alive
@@ -177,13 +186,15 @@
 
 
 - project:
-    name: "metal3io_ironic_image"
+    name: "ironic_image"
     repo:
       org: "metal3-io"
       name: "ironic-image"
     jobs:
-    - capm3_v1a4_integration_tests_centos
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
@@ -194,12 +205,13 @@
     - keep_v1a5_test_centos_alive
 
 - project:
-    name: "metal3io_ironic_ipa_downloader"
+    name: "ironic_ipa_downloader"
     repo:
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests:
+        image_os: ubuntu
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu