* [Tarantool-patches] [PATCH v1] gitlab-ci: remove tag from pushed branch commit
@ 2020-10-14 20:59 Alexander V. Tikhonov
2020-10-14 23:32 ` Alexander Turenko
0 siblings, 1 reply; 2+ messages in thread
From: Alexander V. Tikhonov @ 2020-10-14 20:59 UTC (permalink / raw)
To: Alexander Turenko, Kirill Yukhin; +Cc: tarantool-patches
Drop a tag that points to a current commit (if any) on a job triggered
by pushing to a branch (as against of pushing a tag). Otherwise we may
get two jobs for the same x.y.z-0-gxxxxxxxxx build: one is run by
pushing a branch and another by pushing a tag. The idea is to hide the
new tag from the branch job as if a tag would be pushed strictly after
all branch jobs for the same commit.
Closes #3745
Co-authored-by: Alexander Turenko <alexander.turenko@tarantool.org>
---
Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-3745-force-push-live
Issue: https://github.com/tarantool/tarantool/issues/3745
.gitlab-ci.yml | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d40dc74e3..4166443c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,15 +21,22 @@ variables:
# https://docs.gitlab.com/ee/ci/yaml/README.html#git-submodule-strategy
# List of steps:
# 1) Check/clone the Tarantool repository with submodules.
-# 2) For shell based jobs change ownership of all the sources
+# 2) Drop a tag that points to a current commit (if any) on a job triggered by
+# pushing to a branch (as against of pushing a tag). Otherwise we may get
+# two jobs for the same x.y.z-0-gxxxxxxxxx build: one is run by pushing a
+# branch and another by pushing a tag. The idea is to hide the new tag from
+# the branch job as if a tag would be pushed strictly after all branch jobs
+# for the same commit. See gh-3745.
+# 3) For shell based jobs change ownership of all the sources
# to gitlab-runner user (NOTE: in Docker based jobs the
# gitlab-runner user is not known).
-# 3) Fetch Tarantool sources with branches and force checkout
+# 4) Fetch Tarantool sources with branches and force checkout
# of the testing commit.
-# 4) Update submodules recursively (use force where supports).
-# 5) Cleanup all the sources from all files except from repository.
+# 5) Update submodules recursively (use force where supports).
+# 6) Cleanup all the sources from all files except from repository.
before_script:
- /bin/bash -c "pwd && ls -d .git || git clone --recurse-submodules ${CI_REPOSITORY_URL} ."
+ - /bin/bash -c "[ -z \"${CI_COMMIT_TAG:-}\" ] && git tag -d \"$(git tag --points-at HEAD)\" 2>/dev/null || true"
- /bin/bash -c "! docker -v || (uid=`id -u` ; gid=`id -g` ; docker run -w /source -v ${PWD}:/source -i packpack/packpack:el-7 /bin/bash -c \"chown -R \$uid:\$gid * .[^.]*\")"
- /bin/bash -c "git fetch -p && git checkout -f ${CI_COMMIT_SHORT_SHA}"
- /bin/bash -c "git submodule sync --recursive && git submodule update --force --init --recursive || git submodule update --recursive --init"
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Tarantool-patches] [PATCH v1] gitlab-ci: remove tag from pushed branch commit
2020-10-14 20:59 [Tarantool-patches] [PATCH v1] gitlab-ci: remove tag from pushed branch commit Alexander V. Tikhonov
@ 2020-10-14 23:32 ` Alexander Turenko
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Turenko @ 2020-10-14 23:32 UTC (permalink / raw)
To: Alexander V. Tikhonov; +Cc: tarantool-patches
> - /bin/bash -c "pwd && ls -d .git || git clone --recurse-submodules ${CI_REPOSITORY_URL} ."
> + - /bin/bash -c "[ -z \"${CI_COMMIT_TAG:-}\" ] && git tag -d \"$(git tag --points-at HEAD)\" 2>/dev/null || true"
> - /bin/bash -c "! docker -v || (uid=`id -u` ; gid=`id -g` ; docker run -w /source -v ${PWD}:/source -i packpack/packpack:el-7 /bin/bash -c \"chown -R \$uid:\$gid * .[^.]*\")"
> - /bin/bash -c "git fetch -p && git checkout -f ${CI_COMMIT_SHORT_SHA}"
> - /bin/bash -c "git submodule sync --recursive && git submodule update --force --init --recursive || git submodule update --recursive --init"
Just observed: we should remove the tag from ${CI_COMMIT_SHORT_SHA}, not
HEAD. My bad. Fixed it in the pushed commit.
Pushed to master, 2.5, 2.4 and 1.10.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-14 23:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-14 20:59 [Tarantool-patches] [PATCH v1] gitlab-ci: remove tag from pushed branch commit Alexander V. Tikhonov
2020-10-14 23:32 ` Alexander Turenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox