X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=3afc137e61a456e58a9a400b57c90359baf9b46b;hb=refs%2Fchanges%2F15%2F2215%2F2;hp=b51b7a667d281bd3586f49abc362d982e96e2287;hpb=6e05fbfc9c5806406394f63060a6897b9c7bd303;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 b51b7a66..3afc137e 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -38,6 +38,7 @@
           deploy-scenario-version: master
           deploy-scenario-refspec: master
           disabled: false
+          delete-stack: 'yes'
       - 'master':
           nordix-branch: master
           onap-version: master
@@ -47,6 +48,7 @@
           deploy-scenario-version: master
           deploy-scenario-refspec: master
           disabled: false
+          delete-stack: 'no'
 
     distro:
       - ubuntu1804
@@ -66,7 +68,7 @@
 
     onap-other-phases:
       - onap-deploy:
-          build-timeout: 150
+          build-timeout: 210
       - oom-healthcheck:
           build-timeout: 30
           test-type: oom-healthcheck
@@ -86,6 +88,9 @@
       - onap-healthcheck-full:
           build-timeout: 30
           test-type: onap-healthcheck
+      - onap-healthcheck-healthdist:
+          build-timeout: 30
+          test-type: onap-healthcheck
 
     jobs:
       - '{deploy-scenario}-{onap-flavor}-{distro}-{installer-type}-{type}-{ci-loop}-{onap-branch}'
@@ -117,7 +122,7 @@
           description: 'ONAP flavor to deploy - could be core, small, medium, full. Also used for xtesting as run_type.'
       - string:
           name: STACK_NAME
-          default: 'nordix-cicd-onap-{onap-branch}-{onap-flavor}'
+          default: 'nordix-cicd-{deploy-scenario}-{onap-branch}-{onap-flavor}'
       - string:
           name: ENGINE_VERSION
           default: '{engine-version}'
@@ -138,6 +143,10 @@
           name: POD_NAME
           default: '{pod-name}'
           description: 'Development purposes only! Set to none for disabling test results DB reporting.'
+      - string:
+          name: DELETE_STACK
+          default: '{delete-stack}'
+          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
@@ -156,15 +165,18 @@
     wrappers:
       - credentials-binding:
           - file:
-              credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject
+              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
               variable: OPENRC_FILE
       - mask-passwords
       - build-timeout:
-          timeout: 220
+          timeout: 300
       - fix-workspace-permissions
       - openstack:
           single-use: True
 
+    triggers:
+      - timed: '@midnight'
+
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
@@ -333,6 +345,30 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
+            - name: 'onap-healthcheck-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
@@ -403,7 +439,7 @@
     wrappers:
       - credentials-binding:
           - file:
-              credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject
+              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
               variable: OPENRC_FILE
       - mask-passwords
       - build-timeout:
@@ -467,7 +503,7 @@
     wrappers:
       - credentials-binding:
           - file:
-              credential-id: nordix-jenkins-openrcfile-city-frankfurt-defaultproject
+              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
               variable: OPENRC_FILE
       - mask-passwords
       - build-timeout: