Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Set functest repo as variable
[releng.git]
/
jjb
/
releng
/
opnfv-docker.sh
diff --git
a/jjb/releng/opnfv-docker.sh
b/jjb/releng/opnfv-docker.sh
index
9ba6e2b
..
28e5b7c
100644
(file)
--- a/
jjb/releng/opnfv-docker.sh
+++ b/
jjb/releng/opnfv-docker.sh
@@
-12,8
+12,8
@@
set -o nounset
set -o pipefail
set -o pipefail
-
-echo "Starting
opnfv-docker
for $DOCKER_REPO_NAME ..."
+echo "Using Docker $(docker --version) on $NODE_NAME"
+echo "Starting
Docker build
for $DOCKER_REPO_NAME ..."
echo "--------------------------------------------------------"
echo
echo "--------------------------------------------------------"
echo
@@
-61,7
+61,9
@@
done
# Remove the existing containers and images before building
remove_containers_images
# Remove the existing containers and images before building
remove_containers_images
-cd "$WORKSPACE/$DOCKER_DIR" || exit 1
+DOCKER_PATH=$WORKSPACE/$DOCKER_DIR
+
+cd $DOCKER_PATH || exit 1
HOST_ARCH="$(uname -m)"
#If there is a patch for other arch then x86, apply the patch and
#replace Dockerfile file
HOST_ARCH="$(uname -m)"
#If there is a patch for other arch then x86, apply the patch and
#replace Dockerfile file
@@
-75,6
+77,9
@@
echo "Current branch: $BRANCH"
BUILD_BRANCH=$BRANCH
BUILD_BRANCH=$BRANCH
+GERRIT_REFNAME=${GERRIT_REFNAME:-''}
+RELEASE_VERSION=${GERRIT_REFNAME/refs\/tags//}
+
if [[ "$BRANCH" == "master" ]]; then
DOCKER_TAG="latest"
elif [[ -n "${RELEASE_VERSION-}" ]]; then
if [[ "$BRANCH" == "master" ]]; then
DOCKER_TAG="latest"
elif [[ -n "${RELEASE_VERSION-}" ]]; then
@@
-108,7
+113,7
@@
echo "--------------------------------------------------------"
echo
cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BUILD_BRANCH
$ARCH_BUILD_ARG
echo
cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BUILD_BRANCH
$ARCH_BUILD_ARG
- -f $DOCKERFILE
.
"
+ -f $DOCKERFILE
$DOCKER_PATH
"
echo ${cmd}
${cmd}
echo ${cmd}
${cmd}