summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/fuel/fuel-deploy-virtual.sh56
-rwxr-xr-xjjb/fuel/fuel-deploy.sh30
-rw-r--r--jjb/fuel/fuel-project-jobs.yml32
3 files changed, 40 insertions, 78 deletions
diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh
deleted file mode 100755
index e7c83b77f..000000000
--- a/jjb/fuel/fuel-deploy-virtual.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/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"
-
-# checkout the commit that was used for building the downloaded artifact
-# to make sure the ISO and deployment mechanism uses same versions
-echo "Checking out $OPNFV_GIT_SHA1"
-git checkout $OPNFV_GIT_SHA1 --quiet
-
-# create TMPDIR if it doesn't exist
-export TMPDIR=$HOME/tmpdir
-mkdir -p $TMPDIR
-
-# change permissions down to TMPDIR
-chmod a+x $HOME
-chmod a+x $TMPDIR
-
-# get the lab name from SLAVE_NAME
-# we currently support ericsson and intel labs
-LAB_NAME=${NODE_NAME%%-*}
-if [[ ! "$LAB_NAME" =~ (ericsson|intel) ]]; then
- echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!"
- exit 1
-else
- echo "Using configuration for $LAB_NAME"
-fi
-
-# set CONFDIR, BRIDGE
-CONFDIR=$WORKSPACE/deploy/templates/$LAB_NAME/virtual_environment/noha/conf
-BRIDGE=pxebr
-
-# log info to console
-echo "Starting the deployment for a merged change using $INSTALLER_TYPE. This could take some time..."
-echo "--------------------------------------------------------"
-echo
-
-# start the deployment
-echo "Issuing command"
-echo "sudo $WORKSPACE/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh"
-
-sudo $WORKSPACE/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-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 6875a09e7..b0a1c78f1 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -9,24 +9,38 @@ source latest.properties
# echo the info about artifact that is used during the deployment
echo "Using ${OPNFV_ARTIFACT_URL/*\/} for deployment"
-# checkout the commit that was used for building the downloaded artifact
-# to make sure the ISO and deployment mechanism uses same versions
-echo "Checking out $OPNFV_GIT_SHA1"
-git checkout $OPNFV_GIT_SHA1 --quiet
+if [[ "$JOB_NAME" =~ "merge" ]]; then
+ # set simplest scenario for virtual deploys to run for merges
+ DEPLOY_SCENARIO="os-nosdn-nofeature-ha"
+else
+ # for none-merge deployments
+ # checkout the commit that was used for building the downloaded artifact
+ # to make sure the ISO and deployment mechanism uses same versions
+ echo "Checking out $OPNFV_GIT_SHA1"
+ git checkout $OPNFV_GIT_SHA1 --quiet
+fi
# set deployment parameters
-BRIDGE=pxebr
export TMPDIR=$HOME/tmpdir
+BRIDGE=pxebr
LAB_NAME=${NODE_NAME/-*}
POD_NAME=${NODE_NAME/*-}
+if [[ "$NODE_NAME" == "opnfv-jump-2" ]]; then
+ LAB_NAME="lf"
+ POD_NAME="pod2"
+fi
+
if [[ "$NODE_NAME" =~ "virtual" ]]; then
POD_NAME="virtual_kvm"
fi
-if [[ "$NODE_NAME" == "opnfv-jump-2" ]]; then
- LAB_NAME="lf"
- POD_NAME="pod2"
+# we currently support ericsson, intel, and lf labs
+if [[ ! "$LAB_NAME" =~ (ericsson|intel|lf) ]]; then
+ echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!"
+ exit 1
+else
+ echo "Using configuration for $LAB_NAME"
fi
# create TMPDIR if it doesn't exist
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 95bc3a6b4..cedb4eee2 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -194,6 +194,10 @@
enabled: true
max-total: 2
max-per-node: 1
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - 'fuel-deploy-virtual-daily-.*'
parameters:
- project-parameter:
@@ -214,25 +218,25 @@
- 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:
!include-raw-escape: ./fuel-download-artifact.sh
- shell:
- !include-raw-escape: ./fuel-deploy-virtual.sh
+ !include-raw-escape: ./fuel-deploy.sh
- shell:
!include-raw-escape: ./fuel-workspace-cleanup.sh