diff options
Diffstat (limited to 'jjb/fuel')
| -rwxr-xr-x | jjb/fuel/fuel-download-artifact.sh | 15 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 26 |
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: |