X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-onap.yaml;h=488dc81719fc8da33585f6b1c55dc580d9dffe6f;hb=d293bfaac0daf25ff7d85e19b6fee6e36f74f9a1;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..488dc817 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -59,13 +59,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
@@ -133,6 +134,17 @@
           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.'
+      - choice:
+          name: DELETE_STACK
+          choices:
+            - 'yes'
+            - 'no'
+          default: 'yes'
+          description: 'Development purposes only! Whether delete the stack or not. Default is yes. Setting this to no will increase the cost!'
 
     properties:
       - logrotate
@@ -151,11 +163,11 @@
     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
@@ -170,7 +182,7 @@
 
     builders:
       - description-setter:
-          description: $INSTALLER_TYPE | $DEPLOY_SCENARIO
+          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
       - shell: |
           #!/bin/bash
           cp $OPENRC_FILE /tmp/openrc
@@ -188,6 +200,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 +228,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 +256,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 +280,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 +304,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 +328,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 +355,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 +410,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 +466,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: