From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 9AEC4469719 for ; Thu, 15 Oct 2020 16:03:01 +0300 (MSK) Date: Thu, 15 Oct 2020 16:03:20 +0300 From: Alexander Turenko Message-ID: <20201015130320.sbccsq7u52omb25p@tkn_work_nb> References: <582864165b996a1a19539a549c6d297caaaac288.1602735537.git.avtikhon@tarantool.org> <20201015092441.bdf324xlavk2tdjk@tkn_work_nb> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20201015092441.bdf324xlavk2tdjk@tkn_work_nb> Subject: Re: [Tarantool-patches] [PATCH v2] gitlab-ci: remove tag from pushed branch commit List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Alexander V. Tikhonov" Cc: tarantool-patches@dev.tarantool.org On Thu, Oct 15, 2020 at 12:24:41PM +0300, Alexander Turenko wrote: > On Thu, Oct 15, 2020 at 07:19:31AM +0300, Alexander V. Tikhonov wrote: > > 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 > > --- > > > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-3745-force-push-live > > Issue: https://github.com/tarantool/tarantool/issues/3745 > > > > .gitlab-ci.yml | 11 +++++++++-- > > 1 file changed, 9 insertions(+), 2 deletions(-) > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > index d40dc74e3..848855b8e 100644 > > --- a/.gitlab-ci.yml > > +++ b/.gitlab-ci.yml > > @@ -26,12 +26,19 @@ variables: > > # gitlab-runner user is not known). > > # 3) 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. > > +# 4) 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. > > +# 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 "! 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 "[ -z \"${CI_COMMIT_TAG:-}\" ] && git tag -d \"$(git tag --points-at HEAD)\" 2>/dev/null || true" > > - /bin/bash -c "git submodule sync --recursive && git submodule update --force --init --recursive || git submodule update --recursive --init" > > - /bin/bash -c "git clean -ffdx && git submodule foreach git clean -ffdx && git submodule foreach git status" > > I already fixed it by s/HEAD/${CI_COMMIT_SHORT_SHA}/ (and left it be the > second command) and pushed. As Alexander pointed me, we should drop a tag after `git fetch`. My bad (again). Updated on master, 2.5, 2.4 and 1.10 as follows: commit 0f575e01a20a2da76d73e72e77f6ebd0080ef1b1 Author: Alexander Turenko Date: Thu Oct 15 15:51:22 2020 +0300 gitlab-ci: fix tag removal for a branch push job We should remove a tag after fetching of a remote repository. It is hotfix of commit 0f564f3497e6a8afd42da2175104118ba5213593 ('gitlab-ci: remove tag from pushed branch commit'). Follows up #3745 Co-authored-by: Alexander V. Tikhonov diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64986e60a..848855b8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,24 +21,24 @@ 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) Drop a tag that points to a current commit (if any) on a job triggered by +# 2) 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 +# of the testing commit. +# 4) 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). -# 4) Fetch Tarantool sources with branches and force checkout -# of the testing commit. # 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 \"${CI_COMMIT_SHORT_SHA}\")\" 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 "[ -z \"${CI_COMMIT_TAG:-}\" ] && git tag -d \"$(git tag --points-at HEAD)\" 2>/dev/null || true" - /bin/bash -c "git submodule sync --recursive && git submodule update --force --init --recursive || git submodule update --recursive --init" - /bin/bash -c "git clean -ffdx && git submodule foreach git clean -ffdx && git submodule foreach git status"