Merge "Enable Upstream repos CI for metal3-io integration tests"

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-onap.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index dc94ae64937132fae13ab8428a9e1226fe8cd815..4a0b86dd9d7a59aaf646047df333232f47a5b8ee 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -66,7 +66,7 @@
 
     onap-other-phases:
       - onap-deploy:
-          build-timeout: 150
+          build-timeout: 210
       - oom-healthcheck:
           build-timeout: 30
           test-type: oom-healthcheck
@@ -117,7 +117,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 +138,13 @@
           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
@@ -156,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
@@ -175,7 +182,7 @@
 
     builders:
       - description-setter:
-          description: $INSTALLER_TYPE | $DEPLOY_SCENARIO
+          description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
       - shell: |
           #!/bin/bash
           cp $OPENRC_FILE /tmp/openrc
@@ -403,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:
@@ -467,7 +474,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: