X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=b5fcf9b87dcead96cd5de3a0831788fb154474cd;hb=41a9dddf60d110b1001470d5d05b2a23b91a78e9;hp=dd5003023ad4c1b261e677fbb3e158ddd0802b1b;hpb=42a4498e7f0945c37f1a6aa4cd1c82216ebf8c02;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index dd500302..b5fcf9b8 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -38,7 +38,7 @@
           deploy-scenario-version: master
           deploy-scenario-refspec: master
           disabled: false
-          delete-stack: yes
+          delete-stack: 'yes'
       - 'master':
           nordix-branch: master
           onap-version: master
@@ -48,7 +48,7 @@
           deploy-scenario-version: master
           deploy-scenario-refspec: master
           disabled: false
-          delete-stack: no
+          delete-stack: 'no'
 
     distro:
       - ubuntu1804
@@ -76,16 +76,19 @@
           build-timeout: 5
 
     onap-healthcheck-phases:
-      - onap-healthcheck-core:
+      - onap-hc-core:
           build-timeout: 30
           test-type: onap-healthcheck
-      - onap-healthcheck-small:
+      - onap-hc-small:
           build-timeout: 30
           test-type: onap-healthcheck
-      - onap-healthcheck-medium:
+      - onap-hc-medium:
           build-timeout: 30
           test-type: onap-healthcheck
-      - onap-healthcheck-full:
+      - onap-hc-full:
+          build-timeout: 30
+          test-type: onap-healthcheck
+      - onap-hc-healthdist:
           build-timeout: 30
           test-type: onap-healthcheck
 
@@ -140,13 +143,10 @@
           name: POD_NAME
           default: '{pod-name}'
           description: 'Development purposes only! Set to none for disabling test results DB reporting.'
-      - choice:
+      - string:
           name: DELETE_STACK
-          choices:
-            - 'yes'
-            - 'no'
           default: '{delete-stack}'
-          description: 'Development purposes only! Whether delete the stack or not. Default is yes. Setting this to no will increase the cost!'
+          description: 'Development purposes only! Whether delete the stack or not. It must either be yes or no. Setting this to no will increase the cost!'
 
     properties:
       - logrotate
@@ -222,7 +222,7 @@
           name: K8S and OOM Healthcheck using xtesting
           condition: ALWAYS
           projects:
-            - name: 'oom-healthcheck-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+            - name: 'oom-hc-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -249,7 +249,7 @@
           name: ONAP Healthcheck using xtesting
           condition: ALWAYS
           projects:
-            - name: 'onap-healthcheck-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+            - name: 'onap-hc-core-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -273,7 +273,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'onap-healthcheck-small-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+            - name: 'onap-hc-small-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -297,7 +297,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'onap-healthcheck-medium-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+            - name: 'onap-hc-medium-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -321,7 +321,7 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
-            - name: 'onap-healthcheck-full-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+            - name: 'onap-hc-full-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
               current-parameters: false
               predefined-parameters: |
                 SLAVE_LABEL=$SLAVE_LABEL
@@ -345,6 +345,30 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
+            - name: 'onap-hc-healthdist-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
+              current-parameters: false
+              predefined-parameters: |
+                SLAVE_LABEL=$SLAVE_LABEL
+                DISTRO=$DISTRO
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
+                INSTALLER_TYPE=$INSTALLER_TYPE
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DEPLOY_TYPE=$DEPLOY_TYPE
+                ONAP_VERSION=$ONAP_VERSION
+                ONAP_FLAVOR=healthdist
+                TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
+                STACK_NAME=$STACK_NAME
+                ENGINE_VERSION=$ENGINE_VERSION
+                ENGINE_REFSPEC=$ENGINE_REFSPEC
+                DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
+                DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
+                XTESTING_REPO_URL=$XTESTING_REPO_URL
+                ENGINE_ANSIBLE_PARAMS=$ENGINE_ANSIBLE_PARAMS
+                CLEANUP=$CLEANUP
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: false
       - multijob:
           name: Promote ONAP (not activated)
           condition: ALWAYS