fuel, armband: Remove/disable artifact download 19/40919/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 1 Sep 2017 20:30:42 +0000 (22:30 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 2 Sep 2017 20:46:47 +0000 (22:46 +0200)
Armband no longer requires any artifact before starting a deployment.
Fuel (master and stable/E) no longer requires the artifact either,
but since there are some stable/danube deploy jobs on ZTE PODs, we
will hold off removing <fuel-download-artifact.sh> for a while.

Deprecation warning: fuel-download-artifact.sh will be removed later.

JIRA: ARMBAND-295

Change-Id: I3b26733a1120306879eff83b9fac3390b3f5c7b8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
jjb/armband/armband-ci-jobs.yml
jjb/armband/armband-download-artifact.sh [deleted file]
jjb/fuel/fuel-download-artifact.sh
jjb/fuel/fuel-project-jobs.yml
jjb/fuel/fuel-weekly-jobs.yml

index 5768e50..b27b053 100644 (file)
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     builders:
-        - shell:
-            !include-raw-escape: ./armband-download-artifact.sh
         - shell:
             !include-raw-escape: ../fuel/fuel-deploy.sh
 
diff --git a/jjb/armband/armband-download-artifact.sh b/jjb/armband/armband-download-artifact.sh
deleted file mode 100755 (executable)
index 4f83305..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-#           (c) 2017 Enea AB
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o pipefail
-
-# disable Fuel ISO download for master branch
-[[ "$BRANCH" == 'master' ]] && exit 0
-
-echo "Host info: $(hostname) $(hostname -I)"
-
-# Configurable environment variables:
-# ISOSTORE (/iso_mount/opnfv_ci)
-
-if [[ "$JOB_NAME" =~ "merge" ]]; then
-    echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties"
-    # get the properties file for the Armband Fuel ISO built for a merged change
-    curl -f -s -o $WORKSPACE/latest.properties http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties
-else
-    # get the latest.properties file in order to get info regarding latest artifact
-    echo "Downloading http://$GS_URL/latest.properties"
-    curl -f -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties
-fi
-
-# source the file so we get artifact metadata, it will exit if it doesn't exist
-source latest.properties
-
-# echo the info about artifact that is used during the deployment
-OPNFV_ARTIFACT=${OPNFV_ARTIFACT_URL/*\/}
-echo "Using $OPNFV_ARTIFACT for deployment"
-
-# Releng doesn't want us to use anything but opnfv.iso for now. We comply.
-ISO_FILE=${WORKSPACE}/opnfv.iso
-
-# using ISOs for verify & merge jobs from local storage will be enabled later
-if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
-    # check if we already have the ISO to avoid redownload
-    ISOSTORE=${ISOSTORE:-/iso_mount/opnfv_ci}/${BRANCH##*/}
-    if [[ -f "$ISOSTORE/$OPNFV_ARTIFACT" ]]; then
-        echo "ISO exists locally. Skipping the download and using the file from ISO store"
-        ln -s $ISOSTORE/$OPNFV_ARTIFACT ${ISO_FILE}
-        echo "--------------------------------------------------------"
-        echo
-        ls -al ${ISO_FILE}
-        echo
-        echo "--------------------------------------------------------"
-        echo "Done!"
-        exit 0
-    fi
-fi
-
-# Use gsutils if available
-if $(which gsutil &>/dev/null); then
-    DOWNLOAD_URL="gs://$OPNFV_ARTIFACT_URL"
-    CMD="gsutil cp ${DOWNLOAD_URL} ${ISO_FILE}"
-else
-    # download image
-    # -f returns error if the file was not found or on server error
-    DOWNLOAD_URL="http://$OPNFV_ARTIFACT_URL"
-    CMD="curl -f -s -o ${ISO_FILE} ${DOWNLOAD_URL}"
-fi
-
-# log info to console
-echo "Downloading the $INSTALLER_TYPE artifact using URL $DOWNLOAD_URL"
-echo "This could take some time..."
-echo "--------------------------------------------------------"
-echo "$CMD"
-$CMD
-echo "--------------------------------------------------------"
-echo "Done!"
index c3b8253..fa0c88b 100755 (executable)
@@ -11,9 +11,9 @@ set -o errexit
 set -o pipefail
 
 # disable Fuel ISO download for master branch
-[[ "$BRANCH" == 'master' ]] && exit 0
+[[ ! "$BRANCH" =~ (danube) ]] && exit 0
 
-# use proxy url to replace the nomral URL, for googleusercontent.com will be blocked randomly
+# use proxy url to replace the normal URL, or googleusercontent.com will be blocked randomly
 [[ "$NODE_NAME" =~ (zte) ]] && GS_URL=${GS_BASE_PROXY%%/*}/$GS_URL
 
 if [[ "$JOB_NAME" =~ "merge" ]]; then
index dad4599..e850a0a 100644 (file)
@@ -86,8 +86,6 @@
             dependency-jobs: 'fuel-merge-build-{stream}'
 
     builders:
-        - shell:
-            !include-raw-escape: ./fuel-download-artifact.sh
         - shell:
             !include-raw-escape: ./fuel-deploy.sh
         - shell:
             name: '$BUILD_NUMBER - POD: $NODE_NAME Scenario: $DEPLOY_SCENARIO'
 
     builders:
-        - shell:
-            !include-raw-escape: ./fuel-download-artifact.sh
         - shell:
             !include-raw-escape: ./fuel-deploy.sh
 
index e170b97..c681c62 100644 (file)
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
-        - shell:
-            !include-raw-escape: ./fuel-download-artifact.sh
         - shell:
             !include-raw-escape: ./fuel-deploy.sh