X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fiec%2Fiec.yaml;h=0e6308c34abef5f28930708384c73b84fb8eb755;hp=faab5459d7598e7cfe77ee855a501cecb94c976f;hb=33b680fa3e04008ea7a1924a103c28f7aaea8f59;hpb=621a10de775b8f312043e886d8264e8f06ea38bb

diff --git a/jjb/iec/iec.yaml b/jjb/iec/iec.yaml
index faab545..0e6308c 100644
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@ -14,20 +14,29 @@
           gs-pathname: ''
           disabled: false
 
+    # -------------------------------
+    # INSTALLER DEFINITIONS
+    # -------------------------------
+    installer:
+      - fuel
+      - compass
+
     # -------------------------------
     # DEPLOY TYPE DEFINITIONS
     # -------------------------------
-    deploy-type:
-      - fuel-baremetal:
+    deploy_type:
+      - baremetal:
           slave-label: 'aarch64_dev'
           scenario: 'k8-calico-iec-noha'
-      - fuel-virtual:
-          slave-label: 'aarch64_dev'
-          scenario: 'k8-calico-iec-noha'
-      - compass-virtual:
+      - virtual:
           slave-label: 'aarch64_dev'
           scenario: 'k8-calico-iec-noha'
 
+    exclude:
+      # Compass does not run against baremetal PODs yet
+      - installer: compass
+        deploy_type: baremetal
+
     # -------------------------------
     # USECASE DEFINITIONS
     # -------------------------------
@@ -37,9 +46,10 @@
           scenario: 'k8-calico-iec-noha'
 
     jobs:
-      - 'iec-{deploy-type}-daily-{stream}'
-      - 'iec-deploy-{deploy-type}-daily-{stream}'
-      - 'iec-install-{usecase}-{deploy-type}-daily-{stream}'
+      - 'iec-{installer}-{deploy_type}-daily-{stream}'
+      - 'iec-deploy-{installer}-{deploy_type}-daily-{stream}'
+      - 'iec-destroy-{installer}-{deploy_type}-daily-{stream}'
+      - 'iec-install-{usecase}-{installer}-{deploy_type}-daily-{stream}'
 
 ##############
 # PARAMETERS #
@@ -82,12 +92,24 @@
           name: K8S_SSH_KEY
           default: ''
           description: 'SSH key to connect to the K8s master'
+      - string:
+          name: K8S_MASTER_IP_COMPASS
+          default: '10.1.0.50'
+          description: 'IP address to compass connect to the K8s master'
+      - string:
+          name: K8S_SSH_PASSWORD_COMPASS
+          default: 'root'
+          description: 'SSH password to compass connect to the K8s master'
+      - string:
+          name: K8S_SSH_USER_COMPASS
+          default: 'root'
+          description: 'SSH username to compass connect to the K8s master'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'iec-{deploy-type}-daily-{stream}'
+    name: 'iec-{installer}-{deploy_type}-daily-{stream}'
     disabled: '{obj:disabled}'
     concurrent: false
     node: '{slave-label}'
@@ -100,7 +122,8 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '.*-{deploy-type}-daily-.*'
+            - '.*-fuel-{deploy_type}-daily-.*'
+            - '.*-compass-{deploy_type}-daily-.*'
           blocking-level: 'NODE'
 
     wrappers:
@@ -108,7 +131,7 @@
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     triggers:
-      - 'iec-{deploy-type}-daily-{stream}-trigger'
+      - 'iec-{installer}-{deploy_type}-daily-{stream}-trigger'
 
     parameters:
       - lf-infra-parameters:
@@ -122,22 +145,37 @@
 
     builders:
       - trigger-builds:
-          - project: 'iec-deploy-{deploy-type}-daily-{stream}'
+          - project: 'iec-deploy-{installer}-{deploy_type}-daily-{stream}'
             current-parameters: false
-            predefined-parameters: |
+            predefined-parameters:
               DEPLOY_SCENARIO={scenario}
             same-node: true
             block: true
-          - project: 'iec-install-{usecase}-daily-{stream}'
+          - project:
+              !j2: |
+                {%- for uc in usecase -%}
+                iec-install-{{ uc | first }}-{{ installer }}-{{ deploy_type }}-daily-{{ stream }}
+                {%- if not loop.last -%},{%- endif -%}
+                {%- endfor %}
+            current-parameters: false
+            same-node: true
+            block: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
+          - project: 'iec-destroy-{installer}-{deploy_type}-daily-{stream}'
             current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
             same-node: true
             block: true
 
 - job-template:
-    name: 'iec-deploy-{deploy-type}-daily-{stream}'
+    name: 'iec-deploy-{installer}-{deploy_type}-daily-{stream}'
     concurrent: true
     node: '{slave-label}'
-    properties:
+    properties: &properties
       - throttle:
           enabled: true
           max-total: 4
@@ -146,7 +184,9 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '.*-deploy-{deploy-type}-daily-*'
+            - '.*-deploy-{installer}-{deploy_type}-daily-.*'
+            - '.*-destroy-{installer}-{deploy_type}-daily-.*'
+            - '.*-install-.*-{installer}-{deploy_type}-daily-.*'
           blocking-level: 'NODE'
 
     parameters:
@@ -159,7 +199,7 @@
           name: DEPLOY_SCENARIO
           default: '{scenario}'
 
-    wrappers:
+    wrappers: &wrappers
       - build-name:
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
@@ -183,44 +223,62 @@
           description: "POD: $NODE_NAME"
       - conditional-step:
           condition-kind: regex-match
-          regex: 'compass-.*'
-          label: '{deploy-type}'
+          regex: 'compass'
+          label: '{installer}'
           steps:
             - shell:
                 !include-raw-escape: ./iec-compass-build.sh
             - shell:
                 !include-raw-escape: ./iec-compass-deploy.sh
             - shell:
-                !include-raw-escape: ./iec-compass-destroy.sh
+                !include-raw-escape: ./iec-fdn-install.sh
       - conditional-step:
           condition-kind: regex-match
-          regex: 'fuel-.*'
-          label: '{deploy-type}'
+          regex: 'fuel'
+          label: '{installer}'
           steps:
             - shell:
                 !include-raw-escape: ./iec-fuel-deploy.sh
 
-    publishers:
+    publishers: &publishers
       - email:
           recipients: armband@enea.com
       - lf-infra-publish
 
 - job-template:
-    name: 'iec-install-{usecase}-{deploy-type}-daily-{stream}'
+    name: 'iec-destroy-{installer}-{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-*'
-            - '.*-install-{usecase}-{deploy-type}-daily-*'
-          blocking-level: 'NODE'
+    properties: *properties
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+      - '{project}-defaults'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+      - string:
+          name: EXTRA_ARGS
+          default: '-EEE'
+
+    wrappers: *wrappers
+    scm: *scm
+
+    builders:
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - shell:
+          !include-raw-escape: ./iec-{installer}-destroy.sh
+
+    publishers: *publishers
+
+- job-template:
+    name: 'iec-install-{usecase}-{installer}-{deploy_type}-daily-{stream}'
+    concurrent: true
+    node: '{slave-label}'
+    properties: *properties
 
     parameters:
       - lf-infra-parameters:
@@ -232,7 +290,7 @@
 
     wrappers:
       - build-name:
-          name: '$BUILD_NUMBER - Usecase: ${usecase} DeployType: ${deploy-type}'
+          name: '$BUILD_NUMBER - Usecase: ${usecase} DeployType: ${installer}-${deploy_type}'
 
     scm: *scm
 
@@ -240,10 +298,7 @@
       - shell:
           !include-raw-escape: ./iec-{usecase}.sh
 
-    publishers:
-      - email:
-          recipients: armband@enea.com
-      - lf-infra-publish
+    publishers: *publishers
 
 ########################
 # trigger macros