summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorArkadiusz Hiler <arkadiusz.hiler@intel.com>2019-09-02 10:23:14 +0300
committerArkadiusz Hiler <arkadiusz.hiler@intel.com>2019-09-03 18:26:48 +0300
commit88666330f5c93cb740ed668c837c7a797f3f47fc (patch)
tree1fdaa143f7ef8d6bd1b99e51e2a8b45d48d4f8f1 /.gitlab-ci
parent8e18030b0312b1a5f4d7dfe305690e6b9c09cea8 (diff)
.gitlab-ci: Remove dead code
TAG is unused since few revisions of the original patchset ago and never was cleaned up properly. Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to '.gitlab-ci')
-rwxr-xr-x.gitlab-ci/pull-or-rebuild.sh8
1 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab-ci/pull-or-rebuild.sh b/.gitlab-ci/pull-or-rebuild.sh
index 9f33b414..7e69477e 100755
--- a/.gitlab-ci/pull-or-rebuild.sh
+++ b/.gitlab-ci/pull-or-rebuild.sh
@@ -38,12 +38,12 @@ IMAGE_PRESENT=$?
set -e
if [ $IMAGE_PRESENT -eq 0 ] && [ ${FORCE_REBUILD:-0} -eq 0 ] ; then
- echo "Skipping $NAME:$TAG, already built"
+ echo "Skipping, already built"
docker tag $DOCKERNAME $NAME
docker tag $DOCKERNAME $REFNAME
docker tag $DOCKERNAME $COMMITNAME
else
- echo "Building $NAME:$TAG"
+ echo "Building!"
docker build --build-arg=CI_COMMIT_SHA=$CI_COMMIT_SHA \
-t $DOCKERNAME -t $NAME \
-t $REFNAME -t $COMMITNAME -f $DOCKERFILE .
@@ -51,7 +51,3 @@ else
fi
docker push $REFNAME
docker push $COMMITNAME
-if [ $TAG = "master" ]; then
- docker tag $CHECKNAME $IMAGENAME
- docker push $IMAGENAME
-fi