X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fiec%2Fiec.yaml;h=36b7cfb84312ee75238d4bfb8661313b1e2b5e13;hp=6594ec5327d754452ab3efd90f34b968d42cd186;hb=c1b6901cf2821ce7c9fe422d33ad33f04dca3dee;hpb=ae2d70f55587ca3677df1e155cf4770af0e92156

diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index 6594ec5..36b7cfb 100644
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -4,7 +4,9 @@
     project-name: 'iec'
     project: '{project-name}'
     views:
-      - project-view
+      - common-view:
+          view-name: iec
+          view-regex: '^{project-name}-(tox|type1|type2)-(verify|fuel|compass)-.*'
     # -------------------------------
     # BRANCH DEFINITIONS
     # -------------------------------
@@ -15,150 +17,97 @@
           disabled: false
 
     # -------------------------------
+    # INSTALLER DEFINITIONS
+    # -------------------------------
+    installer:
+      - fuel
+      - compass
+
+    # -------------------------------
+    # OPERATING SYSTEM DEFINITIONS
+    # -------------------------------
+    os:
+      - ubuntu1604
+      - ubuntu1804
+      - centos7
+    #--------------------------------
+    # IEC TYPE DEFINITINONS
+    # type1 Mcbin embeded board
+    # type2 Arm Server
+    # -------------------------------
+    iecType:
+      - type1
+      - type2
+    # -------------------------------
     # DEPLOY TYPE DEFINITIONS
     # -------------------------------
-    deploy-type:
-      - fuel-baremetal:
-          slave-label: 'aarch64_dev'
+    deploy_type:
+      - baremetal:
+          slave-label: 'aarch64_baremetal_dev'
           scenario: 'k8-calico-iec-noha'
-      - fuel-virtual:
+      - virtual:
           slave-label: 'aarch64_dev'
           scenario: 'k8-calico-iec-noha'
 
-    jobs:
-      - 'iec-{deploy-type}-daily-{stream}'
-      - 'iec-deploy-{deploy-type}-daily-{stream}'
-
-##############
-# PARAMETERS #
-##############
-- parameter:
-    name: 'iec-defaults'
-    parameters:
-      - string:
-          name: INSTALLER_IP
-          default: '10.20.0.2'
-          description: 'IP of the installer'
-      - string:
-          name: SSH_KEY
-          default: "/var/lib/opnfv/mcp.rsa"
-          description: 'Path to private SSH key to access environment nodes'
-      - string:
-          name: EXTERNAL_NETWORK
-          default: 'floating_net'
-          description: 'external network for test'
-      - string:
-          name: CI_DEBUG
-          default: 'false'
-          description: "Show debug output information"
-
-########################
-# job templates
-########################
-- job-template:
-    name: 'iec-{deploy-type}-daily-{stream}'
-    disabled: '{obj:disabled}'
-    concurrent: false
-    node: '{slave-label}'
-    properties:
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '.*-{deploy-type}-daily-.*'
-          blocking-level: 'NODE'
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-    triggers:
-      - 'iec-{deploy-type}-daily-{stream}-trigger'
+    exclude:
+      # Compass does not run against baremetal PODs yet
+      - installer: compass
+        deploy_type: baremetal
+      - installer: compass
+        os: centos7
+      - installer: compass
+        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
 
-    parameters:
-      - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
-      - '{project}-defaults'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'k8-calico-iec-noha'
-
-    builders:
-      - trigger-builds:
-          - project: 'iec-deploy-{deploy-type}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO={scenario}
-              INSTALLER_VERSION={stream}
-            same-node: true
-            block: true
+    # -------------------------------
+    # USECASE DEFINITIONS
+    # -------------------------------
+    usecase:
+      - seba_on_arm
 
-- job-template:
-    name: 'iec-deploy-{deploy-type}-daily-{stream}'
-    concurrent: true
-    node: '{slave-label}'
-    properties:
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '.*-deploy-{deploy-type}-daily-*'
-          blocking-level: 'NODE'
+    phase:
+      - install
+      - test
 
-    parameters:
-      - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
-      - '{project}-defaults'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'k8-calico-iec-noha'
+    jobs:
+      - akraino-iec-install
+      - akraino-iec-deploy
+      - akraino-iec-destroy
+      - akraino-iec-phase-usecase
+      - gerrit-sonar:
+          sonar-project-file: ""
+          build-node: centos7-builder-2c-1g
+          sonar-properties: |
+            # Required metadata
+            sonar.projectKey=iec
+            sonar.projectName=iec
+            sonar.organization=akraino-edge-stack
 
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+            #Source
+            sonar.sources=.
+            sonar.exclusions=**/*_test.go,**/vendor/**
 
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}/{project}.git'
-          refspec: ''
-          branch: '{branch}'
-          submodule-recursive: false
-          submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: default
+            # Language
+            sonar.language=go
 
-    builders:
-      - shell:
-          !include-raw-escape: ./iec-fuel-deploy.sh
+            # Encoding
+            sonar.build.sourceEncoding=UTF-8
 
-    publishers:
-      - email:
-          recipients: armband@enea.com
+            # Inclusions
+            sonar.inclusions=**/**.go
 
-########################
-# trigger macros
-########################
-# CI PODs
-# ----------------------------------------------------------------
-# Akraino IEC CI Baremetal Triggers running against master branch
-# ----------------------------------------------------------------
-- trigger:
-    name: 'iec-fuel-virtual-daily-master-trigger'
-    triggers:
-      - timed: '0 1 * * *'
-- trigger:
-    name: 'iec-fuel-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
+            # Test Execution
+            sonar.tests=.
+            sonar.test.inclusions=**/*_test.go
+            sonar.test.exclusions=**/vendor/**