Also use latest for images built on master and stable for images built on stable branch.
Change-Id: I0988be86abcb2a13d8e94962b4ba1ced8778793b
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
stream: master
branch: '{stream}'
gs-pathname: ''
+ docker-tag: 'latest'
brahmaputra: &brahmaputra
stream: brahmaputra
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ docker-tag: 'brahmaputra.1.0'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
- string:
name: DEPLOY_SCENARIO
default: 'os-odl_l2-nofeature-ha'
+ - string:
+ name: DOCKER_TAG
+ default: '{docker-tag}'
+ description: 'Tag to pull docker image'
- functest-parameter:
gs-pathname: '{gs-pathname}'
sudo rm -rf ${dir_result}/*
res_volume="-v ${dir_result}:/home/opnfv/functest/results"
- docker pull opnfv/functest:latest >$redirect
+ docker pull opnfv/functest:$DOCKER_TAG >$redirect
cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /bin/bash"
echo "Functest: Running docker run command: ${cmd}"
${cmd}
if [[ "$branch" == "master" ]]; then
DOCKER_TAG="master"
+ DOCKER_BRANCH_TAG="latest"
else
git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng
DOCKER_TAG=$($WORKSPACE/releng/utils/calculate_version.sh -t docker \
-n $DOCKER_REPO_NAME)
+ DOCKER_BRANCH_TAG="stable"
ret_val=$?
if [[ $ret_val -ne 0 ]]; then
# Start the build
-echo "Building docker image: $DOCKER_REPO_NAME:latest"
+echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG"
-docker build --no-cache -t $DOCKER_REPO_NAME:latest .
+docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG .
echo "Creating tag '$DOCKER_TAG'..."
-docker tag -f $DOCKER_REPO_NAME:latest $DOCKER_REPO_NAME:$DOCKER_TAG
+docker tag -f $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG $DOCKER_REPO_NAME:$DOCKER_TAG
# list the images
echo "Available images are:"
echo "--------------------------------------------------------"
echo
# Push to the Dockerhub repository
- echo "Pushing $DOCKER_REPO_NAME:latest ..."
- docker push $DOCKER_REPO_NAME:latest
+ echo "Pushing $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG ..."
+ docker push $DOCKER_REPO_NAME:$DOCKER_BRANCH_TAG
echo "Pushing $DOCKER_REPO_NAME:$DOCKER_TAG ..."
docker push $DOCKER_REPO_NAME:$DOCKER_TAG
stream: master
branch: '{stream}'
gs-pathname: ''
+ docker-tag: 'latest'
brahmaputra: &brahmaputra
stream: brahmaputra
branch: 'stable/{stream}'
gs-pathname: '{stream}'
+ docker-tag: 'brahmaputra.1.0'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
- string:
name: DEPLOY_SCENARIO
default: 'os-odl_l2-nofeature-ha'
+ - string:
+ name: DOCKER_TAG
+ default: '{docker-tag}'
+ description: 'Tag to pull docker image'
- string:
name: YARDSTICK_SUITE_NAME
default: opnfv_${{NODE_NAME}}_{suite}.yaml
-e YARDSTICK_BRANCH=${GIT_BRANCH##origin/} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
# Pull the latest image
- docker pull opnfv/yardstick >$redirect
+ docker pull opnfv/yardstick:$DOCKER_TAG >$redirect
# Run docker
cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \