diff options
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 4 | ||||
| -rwxr-xr-x | jjb/xci/xci-set-scenario.sh | 8 | ||||
| -rwxr-xr-x | jjb/xci/xci-start-deployment.sh | 11 | ||||
| -rwxr-xr-x | jjb/xci/xci-start-new-vm.sh | 4 |
4 files changed, 19 insertions, 8 deletions
diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index 7c639b75b..9a235940e 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -27,8 +27,8 @@ fi # if the change is coming to releng-xci, we don't need to do anything since the patch is checked # out to the WORKSPACE anyways if [[ $GERRIT_PROJECT != "releng-xci" ]]; then - /bin/rm -rf $WORKSPACE - git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE + cd $HOME && /bin/rm -rf $WORKSPACE + git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE && cd $WORKSPACE fi # skip the deployment if the scenario is not supported on this distro diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh index 3b3a0cfab..1bd6fd0c5 100755 --- a/jjb/xci/xci-set-scenario.sh +++ b/jjb/xci/xci-set-scenario.sh @@ -32,8 +32,8 @@ fi # if the change is coming to releng-xci, we don't need to do anything since the patch is checked # out to the WORKSPACE anyways if [[ $GERRIT_PROJECT != "releng-xci" ]]; then - /bin/rm -rf $WORKSPACE - git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE + cd $HOME && /bin/rm -rf $WORKSPACE + git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE && cd $WORKSPACE fi WORK_DIRECTORY=/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO @@ -55,7 +55,7 @@ fi git clone https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT $WORK_DIRECTORY/$GERRIT_PROJECT cd $WORK_DIRECTORY/$GERRIT_PROJECT git fetch https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT $GERRIT_REFSPEC && git checkout FETCH_HEAD -DEPLOY_SCENARIO=$(git diff HEAD^..HEAD --name-only | grep scenarios | sed -r 's/scenarios\/(.*?)\/role.*/\1/' | uniq) +DEPLOY_SCENARIO=$(git diff HEAD^..HEAD --name-only | grep scenarios | sed -r 's/scenarios\/(.*?)\/.*/\1/' | uniq) # ensure single scenario is impacted if [[ $(echo $DEPLOY_SCENARIO | wc -w) != 1 ]]; then @@ -66,7 +66,7 @@ if [[ $(echo $DEPLOY_SCENARIO | wc -w) != 1 ]]; then fi # save the scenario name into java properties file to be injected to downstream jobs via envInject -echo "Recording scenario name for downstream jobs" +echo "Recording scenario name '$DEPLOY_SCENARIO' for downstream jobs" echo "DEPLOY_SCENARIO=$DEPLOY_SCENARIO" > $WORK_DIRECTORY/scenario.properties # skip the deployment if the scenario is not supported on this distro diff --git a/jjb/xci/xci-start-deployment.sh b/jjb/xci/xci-start-deployment.sh index e86f5b3a1..1dc3fa405 100755 --- a/jjb/xci/xci-start-deployment.sh +++ b/jjb/xci/xci-start-deployment.sh @@ -20,6 +20,17 @@ if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then exit 0 fi +# if the scenario is external, we need to wipe WORKSPACE to place releng-xci there since +# the project where the scenario is coming from is cloned and the patch checked out to the +# xci/scenarios/$DEPLOY_SCENARIO to be synched on clean VM +# apart from that, we need releng-xci stuff in WORKSPACE for things to function correctly on Jenkins. +# if the change is coming to releng-xci, we don't need to do anything since the patch is checked +# out to the WORKSPACE anyways +if [[ $GERRIT_PROJECT != "releng-xci" ]]; then + cd $HOME && /bin/rm -rf $WORKSPACE + git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE && cd $WORKSPACE +fi + # skip the deployment if the scenario is not supported on this distro OPNFV_SCENARIO_REQUIREMENTS=$WORKSPACE/xci/opnfv-scenario-requirements.yml if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENTS | grep -q $DISTRO; then diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh index 3cec4b3d2..7db7d863e 100755 --- a/jjb/xci/xci-start-new-vm.sh +++ b/jjb/xci/xci-start-new-vm.sh @@ -27,8 +27,8 @@ fi # if the change is coming to releng-xci, we don't need to do anything since the patch is checked # out to the WORKSPACE anyways if [[ $GERRIT_PROJECT != "releng-xci" ]]; then - /bin/rm -rf $WORKSPACE - git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE + cd $HOME && /bin/rm -rf $WORKSPACE + git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE && cd $WORKSPACE fi # skip the deployment if the scenario is not supported on this distro |