summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-13 17:56:33 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-13 18:58:01 +0000
commita22d86a953b6c339062373909c66f029c7cc9e2d (patch)
tree77f55c5e182520820ad63daf053686e81c847534 /jjb
parent8bb9ae8b4de09965d1f2919ec63a5a2282f7a364 (diff)
fuel: Disable use of local ISO and trigger of merge virtual deploy jobs
Scenario and POD descriptions impact virtual deployments and need adjustments. Merge virtual deploy triggers have been disabled in order not to give incorrect feedback to people. Change-Id: I93aef5e029f64b74cf13ad82742b080a18d28da4 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/fuel/fuel-download-artifact.sh15
-rw-r--r--jjb/fuel/fuel-project-jobs.yml26
2 files changed, 21 insertions, 20 deletions
diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh
index 655554127..a1a1de47e 100755
--- a/jjb/fuel/fuel-download-artifact.sh
+++ b/jjb/fuel/fuel-download-artifact.sh
@@ -24,13 +24,14 @@ OPNFV_ARTIFACT=${OPNFV_ARTIFACT_URL/*\/}
echo "Using $OPNFV_ARTIFACT for deployment"
# check if we already have the ISO to avoid redownload
-ISO_STORE=$HOME/opnfv/iso_store/fuel
-if [[ -f "$ISO_STORE/$OPNFV_ARTIFACT" ]]; then
- echo "ISO already exists. Skipping the download"
- ln -s $ISO_STORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso
- ls -al $WORKSPACE/opnfv.iso
- exit 0
-fi
+# disabled for the timebeing - needs adjustments
+#ISO_STORE=$HOME/opnfv/iso_store/fuel
+#if [[ -f "$ISO_STORE/$OPNFV_ARTIFACT" ]]; then
+# echo "ISO already exists. Skipping the download"
+# ln -s $ISO_STORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso
+# ls -al $WORKSPACE/opnfv.iso
+# exit 0
+#fi
# log info to console
echo "Downloading the $INSTALLER_TYPE artifact using URL http://$OPNFV_ARTIFACT_URL"
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 40f41b883..95bc3a6b4 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -214,19 +214,19 @@
- ssh-agent-credentials:
users: '{ssh-credentials}'
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- dependency-jobs: 'fuel-merge-build-{stream}'
+# triggers:
+# - gerrit:
+# trigger-on:
+# - change-merged-event
+# - comment-added-contains-event:
+# comment-contains-value: 'remerge'
+# projects:
+# - project-compare-type: 'ANT'
+# project-pattern: '{project}'
+# branches:
+# - branch-compare-type: 'ANT'
+# branch-pattern: '**/{branch}'
+# dependency-jobs: 'fuel-merge-build-{stream}'
builders:
- shell: