engine: Adjust build-timeout and switch to wget for OpenStack release job

Change-Id: If795f1cec14a89228d41f38618b341401a47e3c5

diff --git a/jjb/cloud-infra/openstack-jobs/openstack-release-deploy-test.yaml b/jjb/cloud-infra/openstack-jobs/openstack-release-deploy-test.yaml
index 08792ecf97966927b2b20695f78029e8136e4d5e..fc5c675551d36bba23d332275afc42fd8de54928 100644 (file)
--- a/jjb/cloud-infra/openstack-jobs/openstack-release-deploy-test.yaml
+++ b/jjb/cloud-infra/openstack-jobs/openstack-release-deploy-test.yaml
@@ -94,7 +94,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 300
+          timeout: 420
       - mask-passwords
       - pre-scm-buildstep:
           failOnError: true

diff --git a/jjb/cloud-infra/openstack-jobs/openstack-release-jobs.yaml b/jjb/cloud-infra/openstack-jobs/openstack-release-jobs.yaml
index c106d49c87d1c6dc4f11d62c17f4f7d6ae39df1b..188e271e2fecc57a862795e7ba030bd61c2de802 100644 (file)
--- a/jjb/cloud-infra/openstack-jobs/openstack-release-jobs.yaml
+++ b/jjb/cloud-infra/openstack-jobs/openstack-release-jobs.yaml
@@ -195,7 +195,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 70
+          timeout: 180
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
@@ -228,7 +228,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 30
+          timeout: 60
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'

diff --git a/jjb/cloud-infra/scripts/download-deploy-artifact.sh b/jjb/cloud-infra/scripts/download-deploy-artifact.sh
index 9b3aebf5c2e5e9ca9af15548f93a2aa60bd27482..7a8ce5d994723afcc212cb7f0f61d2b9ee35070f 100755 (executable)
--- a/jjb/cloud-infra/scripts/download-deploy-artifact.sh
+++ b/jjb/cloud-infra/scripts/download-deploy-artifact.sh
@@ -35,7 +35,8 @@ if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
   echo "Info  : Downloading artifact from Nordix ARM..."
   echo "        $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT"
   cd /tmp
-  curl -s -S -O $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT
+  # NOTE (fdegir): switched from curl -s -S -O to wget to use wget auto-resume functionality
+  wget -q $NORDIX_ARTIFACT_URL/$REMOTE_ARTIFACT
   echo "Info  : Downloaded the artifact for offline deployment. Extracting..."
   echo "        $(ls -al $OFFLINE_INSTALLER_FILE)"
   chmod +x $OFFLINE_INSTALLER_FILE