[igt-dev] [PATCH i-g-t 3/8] .gitlab-ci: Remove dead code

Arkadiusz Hiler
2019-09-03T08:36:39Z

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>
---
.gitlab-ci/pull-or-rebuild.sh | 8 ++------
1 file 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