Commit 38d8f05b authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'use-fetch-head-for-upgrade-migration' into 'master'

Checking out to FETCH_HEAD for migration-paths-upgrade-ce-to-ee

See merge request gitlab-org/gitlab-ee!7856
parents 8fb8052b 6bb9fda7
...@@ -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