Fix cloud infra jobs

Change-Id: I96ac11cc26c7d0a2f35ba1994bfbdcddb6b93465

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 22387dfdc86975b3538a7dfc645acef961320817..133d44c61981efd2fcfc55563fa922328eda6c17 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -75,29 +75,18 @@
     phase:
       - onap-deploy:
           build-timeout: 150
     phase:
       - onap-deploy:
           build-timeout: 150

-          flavor:
-            - full

       - oom-healthcheck:
           build-timeout: 30
           test-type: oom-healthcheck
       - oom-healthcheck:
           build-timeout: 30
           test-type: oom-healthcheck

-          flavor:
-            - full

       - onap-healthcheck:
           build-timeout: 30
           test-type: onap-healthcheck
       - onap-healthcheck:
           build-timeout: 30
           test-type: onap-healthcheck

-          flavor:
-            - core
-            - small
-            - medium
-            - full

       - promote-onap:
           build-timeout: 5
       - promote-onap:
           build-timeout: 5

-          flavor:
-            - full

 
     jobs:
       - '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
 
     jobs:
       - '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'

-      - 'xtesting-{phase}-{flavor}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+      - 'xtesting-{phase}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'

 
 - job-template:
     name: '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
 
 - job-template:
     name: '{deploy-scenario}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'


@@ -240,7 +229,7 @@
               abort-all-job: true
       - multijob:
           name: OOM Healthcheck
               abort-all-job: true
       - multijob:
           name: OOM Healthcheck

-          condition: SUCCESSFUL
+          condition: ALWAYS

           projects:
             - name: 'xtesting-oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: false
           projects:
             - name: 'xtesting-oom-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: false


@@ -265,10 +254,10 @@
               kill-phase-on: NEVER
               abort-all-job: false
       - multijob:
               kill-phase-on: NEVER
               abort-all-job: false
       - multijob:

-          name: ONAP Healthcheck - Core
-          condition: SUCCESSFUL
+          name: ONAP Healthcheck
+          condition: ALWAYS

           projects:
           projects:

-            - name: 'xtesting-onap-healthcheck-core-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'xtesting-onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'

               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO


@@ -291,10 +280,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false

-          name: ONAP Healthcheck - Small
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xtesting-onap-healthcheck-small-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'xtesting-onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'

               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO


@@ -317,10 +303,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false

-          name: ONAP Healthcheck - Medium
-          condition: SUCCESSFUL
-          projects:
-            - name: 'xtesting-onap-healthcheck-medium-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'xtesting-onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'

               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO


@@ -343,10 +326,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false

-          name: ONAP Healthcheck - Full
-          condition: SUCCESSFUL
-          projects:
-            - name: 'onap-healthcheck-periodic-full-{distro}-{installer-type}-{type}-{onap-branch}'
+            - name: 'onap-healthcheck-periodic-{distro}-{installer-type}-{type}-{onap-branch}'

               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO


@@ -371,7 +351,7 @@
               abort-all-job: false
       - multijob:
           name: Promote ONAP
               abort-all-job: false
       - multijob:
           name: Promote ONAP

-          condition: SUCCESSFUL
+          condition: ALWAYS

           projects:
             - name: 'promote-onap-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: false
           projects:
             - name: 'promote-onap-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
               current-parameters: false


@@ -395,7 +375,7 @@
               abort-all-job: false
 
 - job-template:
               abort-all-job: false
 
 - job-template:

-    name: 'xtesting-{phase}-{flavor}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'
+    name: 'xtesting-{phase}-periodic-{distro}-{installer-type}-{type}-{onap-branch}'

 
     disabled: false
 
 
     disabled: false
 


@@ -443,7 +423,7 @@
           description: 'ONAP version to deploy'
       - string:
           name: ONAP_FLAVOR
           description: 'ONAP version to deploy'
       - string:
           name: ONAP_FLAVOR

-          default: '{flavor}'
+          default: '{onap-flavor}'

           description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.'
       - string:
           name: TEST_TYPE
           description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.'
       - string:
           name: TEST_TYPE


@@ -497,7 +477,7 @@
 
     builders:
       - description-setter:
 
     builders:
       - description-setter:

-          description: $INSTALLER_TYPE - $DEPLOY_SCENARIO
+          description: $TEST_TYPE $ONAP_FLAVOR

       - '{phase}-macro'
 
 # vim: set ts=2 sw=2 expandtab:
       - '{phase}-macro'
 
 # vim: set ts=2 sw=2 expandtab: