From dba2985be7bf345d6c63adc752b17dbd2f640f50 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 6 Aug 2015 10:39:54 -0400 Subject: [PATCH] Adds Fuel runner job which uses lab reconfiguration for POD2 JJB updated so that Fuel will now run from POD2 using the genesis-fuel-deploy-runner-* job. Lab reconfig will occur first on master and then deploy builder will execute on POD2. JIRA: OCTO-109 Change-Id: I1dc34461490b0c561386906136ef9f65581599a3 Signed-off-by: Tim Rozet --- jjb/genesis/genesis-fuel.yml | 121 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 119 insertions(+), 2 deletions(-) diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index f6b2d0b7e..c8675907c 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -16,6 +16,7 @@ - 'genesis-fuel-build-{stream}' - 'genesis-fuel-deploy-{stream}' - 'genesis-fuel-deploy-virtual-master' + - 'genesis-fuel-deploy-runner-{stream}' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) @@ -196,7 +197,7 @@ git-revision: true block: true - trigger-builds: - - project: 'genesis-fuel-deploy-{stream}' + - project: 'genesis-fuel-deploy-runner-{stream}' git-revision: true block: true - trigger-builds: @@ -244,7 +245,7 @@ disabled: false - node: opnfv-jump-1 + node: opnfv-jump-2 parameters: - project-parameter: @@ -273,6 +274,45 @@ - 'fuel-download-artifact' - 'fuel-deploy-{stream}' +- job-template: + name: 'genesis-fuel-deploy-runner-{stream}' + + project-type: freestyle + + disabled: false + + node: master + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + parameters: + - project-parameter: + project: '{project}' + - fuel-parameter: + installer: '{installer}' + gs-pathname: '{gs-pathname}' + - string: + name: GIT_BASE + default: ssh://gerrit.opnfv.org:29418/$PROJECT + description: "Used for overriding the GIT URL coming from parameters macro." + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + builders: + - 'fuel-lab-reconfig' + - trigger-builds: + - project: 'genesis-fuel-deploy-{stream}' + git-revision: true + block: true + - job-template: name: 'genesis-fuel-deploy-virtual-master' @@ -545,6 +585,83 @@ # delete everything that is in $WORKSPACE /bin/rm -rf $WORKSPACE +- builder: + name: 'fuel-lab-reconfig' + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o nounset + set -o pipefail + + # check to see if ucs login info file exists + if [ -e ~/.ssh/ucs_creds ];then + source ~/.ssh/ucs_creds + else + echo "Unable to find UCS credentials for LF lab reconfiguration...Exiting" + exit 1 + fi + + # clone releng + echo "Cloning releng repo..." + if ! GIT_SSL_NO_VERIFY=true git clone https://gerrit.opnfv.org/gerrit/releng; then + echo "Unable to clone releng repo...Exiting" + exit 1 + fi + + # log info to console + echo "Starting the lab reconfiguration for $INSTALLER..." + echo "--------------------------------------------------------" + echo + + # create venv + $WORKSPACE/releng/utils/lab-reconfiguration/create_venv.sh + + # disable nounset because 'activate' script contains unbound variable(s) + set +o nounset + # enter venv + source $WORKSPACE/releng/utils/lab-reconfiguration/venv/bin/activate + # set nounset back again + set -o nounset + + # verify we are in venv + if [[ ! $(which python | grep venv) ]]; then + echo "Unable to activate venv...Exiting" + exit 1 + fi + + python $WORKSPACE/releng/utils/lab-reconfiguration/reconfigUcsNet.py -i $ucs_host -u $ucs_user -p $ucs_password -f $WORKSPACE/releng/utils/lab-reconfiguration/fuel.yaml + + # while undergoing reboot + sleep 30 + + # check to see if slave is back up + ping_counter=0 + ping_flag=0 + while [ "$ping_counter" -lt 20 ]; do + if [[ $(ping -c 5 172.30.10.72) ]]; then + ping_flag=1 + break + fi + ((ping_counter++)) + sleep 10 + done + + if [ "$ping_flag" -eq 1 ]; then + echo "Slave is pingable, now wait 60 seconds for services to start" + sleep 60 + else + echo "Slave did not come back up after reboot: please check opnfv-jump-2" + exit 1 + fi + + set +o nounset + deactivate + + echo + echo "--------------------------------------------------------" + echo "Done!" + ######################## # trigger macros ######################## -- 2.16.6