diff options
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 20 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 6 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-upload-artifact.sh | 8 |
3 files changed, 31 insertions, 3 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 0fb5c7c36..d293554c2 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -50,6 +50,8 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - 'os-odl_l3-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' + - 'os-odl_l2-bgpvpn-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - 'os-nosdn-nofeature-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-kvm-ha': @@ -271,3 +273,21 @@ name: 'fuel-os-odl_l3-nofeature-ha-virtual-trigger' triggers: - timed: '' + +# os-odl_l2-bgpvpn-ha trigger +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-trigger' + triggers: + - timed: '0 8 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-trigger' + triggers: + - timed: '' diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index d1f93676c..2e30fb1e6 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -209,6 +209,8 @@ concurrent: true + disabled: false + properties: - throttle: enabled: true @@ -217,7 +219,9 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'fuel-deploy-virtual-daily-.*' + - 'fuel-os-.*?-virtual-daily-.*' + - 'fuel-merge-deploy-virtual-.*' + block-level: 'NODE' parameters: - project-parameter: diff --git a/jjb/fuel/fuel-upload-artifact.sh b/jjb/fuel/fuel-upload-artifact.sh index fa695e6b0..8b69f5a78 100755 --- a/jjb/fuel/fuel-upload-artifact.sh +++ b/jjb/fuel/fuel-upload-artifact.sh @@ -11,8 +11,8 @@ if [ -f $WORKSPACE/.noupload ]; then fi # log info to console +echo echo "Uploading the $INSTALLER_TYPE artifact. This could take some time..." -echo "--------------------------------------------------------" echo # source the opnfv.properties to get ARTIFACT_VERSION @@ -39,7 +39,11 @@ gsutil -m setmeta \ -h "Cache-Control:private, max-age=0, no-transform" \ gs://$GS_URL/*.iso > /dev/null 2>&1 +echo "Done!" echo echo "--------------------------------------------------------" -echo "Done!" +echo echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" +echo +echo "--------------------------------------------------------" +echo |