diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 1 | ||||
| -rwxr-xr-x | jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh | 14 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index 00024e801..090d2e1f2 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -93,6 +93,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: + - 'daisy-os-.*?-{pod}-daily-.*?' - 'daisy-daily-.*' - 'daisy-kolla-build-.*' block-level: 'NODE' diff --git a/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh b/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh index d080df553..9a1e2fc20 100755 --- a/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh +++ b/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh @@ -74,11 +74,21 @@ mkdir -p docker_build_dir # -j is for deciding which branch will be used when building, # only for OPNFV -./ci/kolla-build.sh -j $JOB_NAME -w $WORKSPACE/docker_build_dir +sudo -E ./ci/kolla-build.sh -j $JOB_NAME -w $WORKSPACE/docker_build_dir + +if [ $? -ne 0 ]; then + echo + echo "Kolla build failed!" + deploy_ret=1 +else + echo + echo "--------------------------------------------------------" + echo "Kolla build done!" +fi image=$(ls $WORKSPACE/docker_build_dir/kolla-build-output/kolla-image-*.tgz) upload_image_to_opnfv $image echo echo "--------------------------------------------------------" -echo "Done!" +echo "All done!" diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 17c451c9d..55433d043 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -399,7 +399,7 @@ export PATH=$PATH:/usr/local/bin/ # install python packages - pip install "yamllint==1.6.0" + pip install "yamllint==1.8.2" # generate and upload lint log echo "Running yaml code on $PROJECT ..." |