diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-11-23 13:29:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-11-23 13:29:14 +0000 |
| commit | fcd9e820361be9dbf31481185e11e4a8aebc40f7 (patch) | |
| tree | acf3fbf4a11c1196171dda2a7e4e0179112b46f4 | |
| parent | 7292ffc71c963b26659f3c67ce24f87054c1efa7 (diff) | |
| parent | f6e2b03f9ee349d818a751f540a4268e8d482d09 (diff) | |
Merge "Enable virtual deployments for merged fuel commits"
| -rwxr-xr-x | jjb/fuel/fuel-deploy-virtual.sh | 41 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-virtual-deploy.sh | 3 | ||||
| -rw-r--r-- | jjb/fuel/fuel.yml | 12 |
3 files changed, 49 insertions, 7 deletions
diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh new file mode 100755 index 000000000..ff4f8c3f7 --- /dev/null +++ b/jjb/fuel/fuel-deploy-virtual.sh @@ -0,0 +1,41 @@ +#!/bin/bash +set -o errexit +set -o nounset +set -o pipefail + +# source the file so we get OPNFV vars +source latest.properties + +# echo the info about artifact that is used during the deployment +echo "Using $(echo $OPNFV_ARTIFACT_URL | cut -d'/' -f3) for deployment" + +# create TMPDIR if it doesn't exist +export TMPDIR=$HOME/tmpdir +[[ -d $TMPDIR ]] || mkdir -p $TMPDIR + +# change permissions down to TMPDIR +chmod a+x $HOME +chmod a+x $TMPDIR + +# set CONFDIR, BRIDGE +CONFDIR=$WORKSPACE/fuel/deploy/templates/virtual_environment/conf +BRIDGE=pxebr + +# log info to console +echo "Starting the deployment for a merged change using $INSTALLER. This could take some time..." +echo "--------------------------------------------------------" +echo + +# start the deployment +echo "Issuing command" +echo "sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh" + +sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh + +echo +echo "--------------------------------------------------------" +echo "Virtual deployment is done! Removing the intermediate files from artifact repo" + +PROPERTIES_FILE=$(echo $OPNFV_ARTIFACT_URL | sed 's/iso/properties/') +gsutil rm gs://$OPNFV_ARTIFACT_URL +gsutil rm gs://$PROPERTIES_FILE diff --git a/jjb/fuel/fuel-virtual-deploy.sh b/jjb/fuel/fuel-virtual-deploy.sh deleted file mode 100755 index 4e0b2dc47..000000000 --- a/jjb/fuel/fuel-virtual-deploy.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "Placeholder for Fuel virtual deploy" diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml index e809592fc..60a69c682 100644 --- a/jjb/fuel/fuel.yml +++ b/jjb/fuel/fuel.yml @@ -12,7 +12,7 @@ jobs: - 'fuel-verify-build-{stream}' - 'fuel-merge-build-{stream}' - - 'fuel-merge-virtual-deploy-{stream}' + - 'fuel-merge-deploy-virtual-{stream}' - 'fuel-daily-{stream}' - 'fuel-build-{stream}' - 'fuel-deploy-{stream}' @@ -157,11 +157,11 @@ !include-raw ./fuel-workspace-cleanup.sh - job-template: - name: 'fuel-merge-virtual-deploy-{stream}' + name: 'fuel-merge-deploy-virtual-{stream}' project-type: freestyle - node: ericsson-build + node: fuel-deploy-virtual concurrent: true @@ -213,10 +213,14 @@ - shell: !include-raw ./fuel-download-artifact.sh - shell: - !include-raw ./fuel-virtual-deploy.sh + !include-raw ./fuel-deploy-virtual.sh - shell: !include-raw ./fuel-workspace-cleanup.sh + publishers: + - email: + recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com + - job-template: name: 'fuel-daily-{stream}' |