diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-01 22:30:42 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-02 22:46:47 +0200 |
| commit | 23456c57f4c62489ebaa83e9978f6b9b8074e137 (patch) | |
| tree | 0ab72b35df279fa18ee4928b485121d64918f8da /jjb/fuel | |
| parent | a116ff4c8b680804ca9628a8ff88c4c55e61e38e (diff) | |
fuel, armband: Remove/disable artifact download
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>
Diffstat (limited to 'jjb/fuel')
| -rwxr-xr-x | jjb/fuel/fuel-download-artifact.sh | 4 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/fuel/fuel-weekly-jobs.yml | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh index c3b8253de..fa0c88b5d 100755 --- a/jjb/fuel/fuel-download-artifact.sh +++ b/jjb/fuel/fuel-download-artifact.sh @@ -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 diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index dad4599e2..e850a0acb 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -87,8 +87,6 @@ builders: - shell: - !include-raw-escape: ./fuel-download-artifact.sh - - shell: !include-raw-escape: ./fuel-deploy.sh - shell: !include-raw-escape: ./fuel-workspace-cleanup.sh @@ -151,8 +149,6 @@ builders: - shell: - !include-raw-escape: ./fuel-download-artifact.sh - - shell: !include-raw-escape: ./fuel-deploy.sh ######################## diff --git a/jjb/fuel/fuel-weekly-jobs.yml b/jjb/fuel/fuel-weekly-jobs.yml index e170b9788..c681c6252 100644 --- a/jjb/fuel/fuel-weekly-jobs.yml +++ b/jjb/fuel/fuel-weekly-jobs.yml @@ -172,8 +172,6 @@ - description-setter: description: "Built on $NODE_NAME" - shell: - !include-raw-escape: ./fuel-download-artifact.sh - - shell: !include-raw-escape: ./fuel-deploy.sh publishers: |