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

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 070c3996..7701da47 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -39,13 +39,15 @@
     - openstack_node_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
+    - metal3_dev_tools_integration_test:
+        image_os:
+          - ubuntu
+          - centos
     - artifactory_cleanup
     repo:
       org: "Nordix"
       name: "metal3-dev-tools"
-    ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
+    ci_github_jenkins_credentials_id: 'nordix-metal3-ci-github-prod-token'
     ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
 
@@ -61,18 +63,28 @@
         image_os:
           - ubuntu
           - centos
-    - capm3_v1a5_integration_tests_centos
-    - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
-    - feature_tests_ubuntu
-    - feature_tests_centos
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - feature_tests:
+        image_os:
+          - ubuntu
+          - centos
     - feature_tests_upgrade_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
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 - project:
     name: 'project_infra_cleanup'
@@ -93,15 +105,24 @@
         image_os:
           - ubuntu
           - centos
-    - 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
-    - keep_v1b1_test_centos_alive
-    - keep_v1a5_test_ubuntu_alive
-    - keep_v1a5_test_centos_alive
-    - feature_tests_ubuntu
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - feature_tests:
+        image_os: ubuntu
 
 - project:
     name: "ipam"
@@ -113,48 +134,73 @@
         image_os:
           - ubuntu
           - centos
-    - 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
-    - keep_v1b1_test_centos_alive
-    - keep_v1a5_test_ubuntu_alive
-    - keep_v1a5_test_centos_alive
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 - project:
     name: "metal3_dev_env"
+    repo:
+      org: "metal3-io"
+      name: "metal3-dev-env"
     jobs:
     - 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_main_integration_tests_centos
-    - capm3_v1a5_main_integration_tests_ubuntu
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
-    - capm3_v1b1_main_integration_tests_centos
-    - capm3_v1b1_main_integration_tests_ubuntu
-    - feature_tests_ubuntu
-    - feature_tests_centos
+    - capm3_v1a4_main_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_main_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_main_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - feature_tests:
+        image_os:
+          - ubuntu
+          - centos
     - feature_tests_upgrade_ubuntu
-    - main_feature_tests_ubuntu
-    - main_feature_tests_centos
+    - main_feature_tests:
+        image_os:
+          - ubuntu
+          - centos
     - main_feature_tests_upgrade_ubuntu
     - bml_integration_tests_centos
     - bml_main_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"
-      name: "metal3-dev-env"
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 - project:
     name: "capm3"
@@ -166,23 +212,39 @@
         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_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_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_e2e_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1a5_main_e2e_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_e2e_tests:
+        image_os:
+          - ubuntu
+          - centos
     - capm3_v1b1_e2e_upgrade_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
-    - keep_v1a5_test_centos_alive
+    - capm3_v1b1_main_e2e_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 
 - project:
@@ -195,14 +257,22 @@
         image_os:
           - ubuntu
           - centos
-    - 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
-    - keep_v1b1_test_centos_alive
-    - keep_v1a5_test_ubuntu_alive
-    - keep_v1a5_test_centos_alive
+    - capm3_v1a5_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1b1_test_alive:
+        image_os:
+          - ubuntu
+          - centos
+    - keep_v1a5_test_alive:
+        image_os:
+          - ubuntu
+          - centos
 
 - project:
     name: "ironic_ipa_downloader"
@@ -212,6 +282,9 @@
     jobs:
     - capm3_v1a4_integration_tests:
         image_os: ubuntu
-    - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1b1_integration_tests_centos
-    - capm3_v1b1_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests:
+        image_os: ubuntu
+    - capm3_v1b1_integration_tests:
+        image_os:
+          - ubuntu
+          - centos