From: Don Zickus dzickus@redhat.com

Create ark-latest branch last for CI scripts

It was noticed with the change to use ark-infra, the CI scripts were failing at 'git push gitlab $(git describe).

That command was supposed to push a newly created tag from 'make dist-release-tag' which is pointed to by ark-latest.

A 'git describe' of ark-latest translates to that tag and is easily pushed. With the addition of 'ark-infra', the last branch checked out is ark-infra. A 'git describe' of that branch translates into an un-tagged reference forcing the 'git push' script to fail.

Fix this by forcing the ark-latest branch to be checked last so that 'git describe' works correctly.

Signed-off-by: Don Zickus dzickus@redhat.com

diff a/.gitlab-ci.yml b/.gitlab-ci.yml --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,6 +115,9 @@ rawhide_release: -o merge_request.remove_source_branch \ gitlab "$branch" done; + # ark-create-release.sh creates a tag for ark-latest to be pushed. + # Make sure the ark-latest branch is checked out. + - git checkout ark-latest - git push gitlab "$(git describe)" - git push gitlab ark/* - git push -f gitlab ark-latest

-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1043