diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/fuel/fuel-deploy-virtual.sh | 14 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 6 | ||||
| -rw-r--r-- | jjb/opnfvdocs/opnfvdocs.yml | 2 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 4 |
4 files changed, 17 insertions, 9 deletions
diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh index 1b644354b..7c25812ec 100755 --- a/jjb/fuel/fuel-deploy-virtual.sh +++ b/jjb/fuel/fuel-deploy-virtual.sh @@ -11,14 +11,24 @@ 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 +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=${{SLAVE_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/virtual_environment_noha/conf +CONFDIR=$WORKSPACE/deploy/templates/$LAB_NAME/virtual_environment/noha/conf BRIDGE=pxebr # log info to console diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 576f605d8..43edcc2ca 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -336,12 +336,10 @@ description: 'Slave name on Jenkins' allowed-slaves: - intel-us-deploy-virtual-1 -# ericsson slave has been excluded until the issues are identified and solved -# - ericsson-ca-deploy-virtual-1 + - ericsson-ca-deploy-virtual-1 default-slaves: - intel-us-deploy-virtual-1 -# ericsson slave has been excluded until the issues are identified and solved -# - ericsson-ca-deploy-virtual-1 + - ericsson-ca-deploy-virtual-1 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml index 6b8650e8c..de48aafb7 100644 --- a/jjb/opnfvdocs/opnfvdocs.yml +++ b/jjb/opnfvdocs/opnfvdocs.yml @@ -169,7 +169,7 @@ echo echo "--------------------------------------------------------" for repo in $(grep -v '^#' $WORKSPACE/releng/jjb/opnfvdocs/project.cfg | sort); do - cd $WORKSPACE + cd $WORKSPACE/docs echo " $repo" git clone $GIT_CLONE_BASE/$repo --branch $GERRIT_BRANCH --depth 1 --quiet done diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 9d6a54260..0b16abb12 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -173,7 +173,7 @@ export PATH=$PATH:/usr/local/bin/ [[ $GERRIT_CHANGE_NUMBER =~ .+ ]] - [[ -d output ]] + [[ -d docs_output ]] || exit 0 echo echo "###########################" @@ -208,7 +208,7 @@ set -o pipefail export PATH=$PATH:/usr/local/bin/ - [[ -d output ]] + [[ -d docs_output ]] || exit 0 echo echo "########################" |