From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 15 Apr 2020 01:46:39 +0000 (+0000)
Subject: Merge "iec: exclude seba_on_arm from virtual PODs"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=c1b6901cf2821ce7c9fe422d33ad33f04dca3dee;hp=-c

Merge "iec: exclude seba_on_arm from virtual PODs"
---

c1b6901cf2821ce7c9fe422d33ad33f04dca3dee
diff --combined jjb/akraino-templates/akraino-iec-templates.yaml
index 72f331c,9fba10c..c60e915
--- a/jjb/akraino-templates/akraino-iec-templates.yaml
+++ b/jjb/akraino-templates/akraino-iec-templates.yaml
@@@ -61,13 -61,12 +61,15 @@@
              block: true
            - project:
                !j2: |
+                 {%- if deploy_type not in ['virtual'] -%}
                  {%- for uc in usecase -%}
 -                iec-{{ iecType }}-install-{{ uc }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
 +                {%- for ph in phase -%}
 +                iec-{{ iecType }}-{{ ph }}-{{ uc }}-{{ installer }}-{{ deploy_type }}-{{ os }}-daily-{{ stream }}
 +                {%- if not loop.last -%},{%- endif -%}
 +                {%- endfor %}
                  {%- if not loop.last -%},{%- endif -%}
                  {%- endfor %}
+                 {%- endif -%}
              current-parameters: true
              same-node: true
              block: true
@@@ -199,8 -198,8 +201,8 @@@
      publishers: *publishers
  
  - job-template:
 -    id: akraino-iec-install-usecase
 -    name: 'iec-{iecType}-install-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
 +    id: akraino-iec-phase-usecase
 +    name: 'iec-{iecType}-{phase}-{usecase}-{installer}-{deploy_type}-{os}-daily-{stream}'
      concurrent: true
      node: '{slave-label}'
      properties: *properties
@@@ -212,7 -211,6 +214,7 @@@
            branch: '{branch}'
        - '{project}-defaults'
        - '{installer}-{os}-defaults'
 +      - '{usecase}-defaults'
  
      wrappers:
        - build-name:
@@@ -225,3 -223,4 +227,3 @@@
            !include-raw-escape: ../iec/iec-{usecase}.sh
  
      publishers: *publishers
 -
diff --combined jjb/iec/iec.yaml
index 7d01dda,de21f84..36b7cfb
--- a/jjb/iec/iec.yaml
+++ b/jjb/iec/iec.yaml
@@@ -66,6 -66,9 +66,9 @@@
        - installer: fuel
          deploy_type: baremetal
          os: ubuntu1604
+       # SEBA on virtual PODs should be excluded
+       - deploy_type: virtual
+         usecase: seba_on_arm
  
      # -------------------------------
      # USECASE DEFINITIONS
@@@ -73,15 -76,11 +76,15 @@@
      usecase:
        - seba_on_arm
  
 +    phase:
 +      - install
 +      - test
 +
      jobs:
        - akraino-iec-install
        - akraino-iec-deploy
        - akraino-iec-destroy
 -      - akraino-iec-install-usecase
 +      - akraino-iec-phase-usecase
        - gerrit-sonar:
            sonar-project-file: ""
            build-node: centos7-builder-2c-1g