Merge "iec: fuel: Map new UNH baremetal POD to IEC xDFs"

[ci-management.git] / jjb / iec / iec.yaml

diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index 625017d..5819d3c 100644 (file)
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -6,7 +6,7 @@
     views:
       - common-view:
           view-name: iec
-          view-regex: '^{project-name}-(tox|type1|type2)-(verify|fuel|compass)-.*'
+          view-regex: '^{project-name}-(sonar|(tox|type1|type2)-(verify|fuel|compass)-.*)'
     # -------------------------------
     # BRANCH DEFINITIONS
     # -------------------------------
@@ -43,10 +43,10 @@
     # -------------------------------
     deploy_type:
       - baremetal:
-          slave-label: 'aarch64_dev'
+          slave_label: 'aarch64_baremetal_dev'
           scenario: 'k8-calico-iec-noha'
       - virtual:
-          slave-label: 'aarch64_dev'
+          slave_label: 'aarch64_dev'
           scenario: 'k8-calico-iec-noha'
 
     exclude:
@@ -59,23 +59,37 @@
         os: ubuntu1804
       - iecType: type1
         installer: fuel
+      # Fuel baremetal provisioning only supports Ubuntu 18.04
+      - installer: fuel
+        deploy_type: baremetal
+        os: centos7
+      - installer: fuel
+        deploy_type: baremetal
+        os: ubuntu1604
+      # SEBA on virtual PODs should be excluded
+      - deploy_type: virtual
+        usecase: seba_on_arm
 
     # -------------------------------
     # USECASE DEFINITIONS
     # -------------------------------
     usecase:
-      - seba_on_arm:
-          slave-label: 'aarch64_dev'
-          scenario: 'k8-calico-iec-noha'
+      - seba_on_arm
+
+    phase:
+      - install
+      - test
 
     jobs:
       - akraino-iec-install
       - akraino-iec-deploy
       - akraino-iec-destroy
-      - akraino-iec-install-usecase
+      - akraino-usecase-phase-iec
       - gerrit-sonar:
           sonar-project-file: ""
           build-node: centos7-builder-2c-1g
+          submodule-recursive: false
+          submodule-disable: true
           sonar-properties: |
             # Required metadata
             sonar.projectKey=iec