X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=b5fcf9b87dcead96cd5de3a0831788fb154474cd;hb=bbdc834b319d5e78972ceea00894d17f8ff5b20e;hp=b51b7a667d281bd3586f49abc362d982e96e2287;hpb=a4a44c350f451bd40a6c61ae44ca76e9f0657ef8;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..b5fcf9b8 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
@@ -74,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
 
@@ -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
@@ -210,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
@@ -237,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
@@ -261,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
@@ -285,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
@@ -309,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
@@ -333,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
@@ -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: