Commit 885b181d authored by Douwe Maan's avatar Douwe Maan

Merge branch '5912-git-clean-before-checking' into 'master'

Resolve "ee-files-location-check "git status not clean" - it didn't ignore knapsack"

Closes #5912

See merge request gitlab-org/gitlab-ee!5604
parents 7d0338dc 1220da58
......@@ -23,6 +23,13 @@ module EESpecificCheck
end
def find_compare_base
# We're still seeing errors not ignoring knapsack/ and rspec_flaky/
# Instead of waiting that populate over all the branches, we could
# just remove untracked files anyway, only on CI of course in case
# we're wiping people's data!
# See https://gitlab.com/gitlab-org/gitlab-ee/issues/5912
git_clean if ENV['CI']
setup_canonical_remotes
ce_fetch_head = fetch_remote_ce_branch
......@@ -133,6 +140,10 @@ module EESpecificCheck
run_git_command("status --porcelain")
end
def git_clean
run_git_command('clean -fd')
end
def remove_remotes
run_git_command(
"remote remove canonical-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