diff options
author | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-07 14:37:40 +0100 |
---|---|---|
committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-07 14:55:48 +0000 |
commit | e8ce776643726d0e8f9ff8d6cc0145358ffd3bf0 (patch) | |
tree | 0ae6865789e89d1dc8632b6d7b04f6a4697d0487 /jjb/fuel/fuel-deploy-virtual.sh | |
parent | 324a87b519694309d141bbec8d15726d9cc1adb8 (diff) |
Enable fuel nosdn scenario for master and stable/brahmaputra
This patch proposes below changes:
- Run CI on opnfv-jump-2 against stable/brahmaputra branch
- Run CI on ericsson-pod2 against master branch
- Configure functest against both branches on both PODs
- Enable yardstick against both branches on both PODs
- Comment out additional controllers until nosdn scenario is verified
- Rename OPNFV_FEATURE to DEPLOY_SCENARIO
Change-Id: Ie3d4f946cd51271378b435f9a92af07aaf614c26
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/fuel/fuel-deploy-virtual.sh')
-rwxr-xr-x | jjb/fuel/fuel-deploy-virtual.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh index 7c25812ec..8e9282373 100755 --- a/jjb/fuel/fuel-deploy-virtual.sh +++ b/jjb/fuel/fuel-deploy-virtual.sh @@ -9,6 +9,11 @@ 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 @@ -19,7 +24,7 @@ chmod a+x $TMPDIR # get the lab name from SLAVE_NAME # we currently support ericsson and intel labs -LAB_NAME=${{SLAVE_NAME%%-*}} +LAB_NAME=${{NODE_NAME%%-*}} if [[ ! "$LAB_NAME" =~ (ericsson|intel) ]]; then echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!" exit 1 |