Commit 6bb9fda7 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Checking out to FETCH_HEAD works better with tags

When the found "branch" is a tag, Git can't checkout to
the tag with the remote name as a prefix. See:

https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/106218414

So instead, since we're always fetching something, we could
just use FETCH_HEAD in this case, and that also works with tags.

Also, we shouldn't run any EE-specific checks for tags:

https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/105906272

It didn't fail but we could clearly see that there were errors,
and there's no reasons to run it for tags.
parent f9b46e30
...@@ -338,8 +338,8 @@ stages: ...@@ -338,8 +338,8 @@ stages:
variables: variables:
SETUP_DB: "false" SETUP_DB: "false"
script: script:
- CE_HEAD=$(ruby -r./scripts/ee_specific_check/ee_specific_check -e'puts EESpecificCheck.fetch_remote_ce_branch') - ruby -r./scripts/ee_specific_check/ee_specific_check -e'EESpecificCheck.fetch_remote_ce_branch'
- git checkout -f $CE_HEAD - git checkout -f FETCH_HEAD
- . scripts/utils.sh - . scripts/utils.sh
- . scripts/prepare_build.sh - . scripts/prepare_build.sh
- date - date
...@@ -468,7 +468,7 @@ retrieve-tests-metadata: ...@@ -468,7 +468,7 @@ retrieve-tests-metadata:
retry: 0 retry: 0
only: only:
- branches - branches
- //@gitlab-org/gitlab-ee - branches@gitlab-org/gitlab-ee
except: except:
- master - master
- /[\d-]+-stable(-ee)?/ - /[\d-]+-stable(-ee)?/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment