cloud-infra: Fix stack deletion script

[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 7818e05264268bd168380353fa28e14ba8788476..fd2a6b7fe7ac875e274057a2effbbaeb3e05e8d7 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -39,9 +39,9 @@
           daily-trigger: '#@midnight'
 
     onap-branch:
-      - 'dublin':
+      - 'elalto':
           nordix-branch: master
-          onap-version: dublin
+          onap-version: elalto
           onap-flavor: full
           engine-version: master
           engine-refspec: master
@@ -81,7 +81,7 @@
           build-timeout: 30
           test-type: oom-healthcheck
       - promote-onap:
-          build-timeout: 5
+          build-timeout: 240
 
     onap-healthcheck-phases:
       - onap-hc-core:
@@ -193,7 +193,7 @@
               variable: OPENRC_FILE
       - mask-passwords
       - build-timeout:
-          timeout: 300
+          timeout: 630
       - fix-workspace-permissions
       - openstack:
           single-use: True
@@ -214,7 +214,7 @@
           description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
       - shell: |
           #!/bin/bash
-          /bin/rm -rf /tmp/openrc && /bin/cp -f $OPENRC_FILE /tmp/openrc
+          sudo /bin/rm -rf /tmp/openrc && sudo /bin/cp -f $OPENRC_FILE /tmp/openrc
       - multijob:
           name: Deploy ONAP using OOM
           condition: ALWAYS
@@ -503,6 +503,15 @@
       - build-timeout:
           timeout: '{build-timeout}'
       - fix-workspace-permissions
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: 'nordix-cicd-arm-credentials'
+              username: NORDIX_ARM_USERNAME
+              password: NORDIX_ARM_TOKEN
+          - username-password-separated:
+              credential-id: 'nordix-cicd-harbor-credentials'
+              username: NORDIX_HARBOR_USERNAME
+              password: NORDIX_HARBOR_PASSWORD
 
     scm:
       - git-scm: