X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=e04d9752ce570b5ba2c32ca32e6699deca56a75b;hb=refs%2Fchanges%2F07%2F2107%2F1;hp=8328d94298c84c703eec25909f253a1b19406e79;hpb=da8abf730097845c6532eb7032d3c2058d8c7429;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 8328d942..e04d9752 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
@@ -59,13 +61,14 @@
 
     type:
       - cloud:
+          pod-name: est-cloud
           provisioner-type: heat
           installer-type: kubespray
           slave-label: 'jumphost-onap-ubuntu1804'
 
     onap-other-phases:
       - onap-deploy:
-          build-timeout: 150
+          build-timeout: 210
       - oom-healthcheck:
           build-timeout: 30
           test-type: oom-healthcheck
@@ -116,7 +119,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}'
@@ -133,6 +136,14 @@
           name: DEPLOY_SCENARIO_REFSPEC
           default: '{deploy-scenario-refspec}'
           description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_VERSION and must be refspec.'
+      - string:
+          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
@@ -151,15 +162,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
@@ -170,7 +184,7 @@
 
     builders:
       - description-setter:
-          description: $INSTALLER_TYPE | $DEPLOY_SCENARIO
+          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
       - shell: |
           #!/bin/bash
           cp $OPENRC_FILE /tmp/openrc
@@ -188,6 +202,7 @@
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=$ONAP_FLAVOR
+                POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -215,6 +230,7 @@
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=full
                 TEST_TYPE=oom-healthcheck
+                POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -242,6 +258,7 @@
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=core
                 TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -265,6 +282,7 @@
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=small
                 TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -288,6 +306,7 @@
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=medium
                 TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -311,6 +330,7 @@
                 ONAP_VERSION=$ONAP_VERSION
                 ONAP_FLAVOR=full
                 TEST_TYPE=onap-healthcheck
+                POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
@@ -337,6 +357,7 @@
                 ONAP_FLAVOR=$ONAP_FLAVOR
                 ENGINE_VERSION=$ENGINE_VERSION
                 ENGINE_REFSPEC=$ENGINE_REFSPEC
+                POD_NAME=$POD_NAME
                 STACK_NAME=$STACK_NAME
                 DEPLOY_SCENARIO_VERSION=$DEPLOY_SCENARIO_VERSION
                 DEPLOY_SCENARIO_REFSPEC=$DEPLOY_SCENARIO_REFSPEC
@@ -391,7 +412,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:
@@ -447,11 +468,15 @@
           name: DEPLOY_SCENARIO_REFSPEC
           default: '{deploy-scenario-refspec}'
           description: 'Development purposes only! Nordix Cloud Infra Scenario version to use for deploying ONAP. Depends on DEPLOY_SCENARIO_VERSION and must be refspec.'
+      - string:
+          name: POD_NAME
+          default: '{pod-name}'
+          description: 'Development purposes only! Set to none for disabling test results DB reporting.'
 
     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: