Commit 1220da58 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Run `git clean -fd` before checking CE/EE status

We don't upload artifacts and cache in those jobs anyway,
and this should make the job more reliable instead of
relying on .gitignore
parent 52df6f78
...@@ -23,6 +23,13 @@ module EESpecificCheck ...@@ -23,6 +23,13 @@ module EESpecificCheck
end end
def find_compare_base 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 setup_canonical_remotes
ce_fetch_head = fetch_remote_ce_branch ce_fetch_head = fetch_remote_ce_branch
...@@ -132,6 +139,10 @@ module EESpecificCheck ...@@ -132,6 +139,10 @@ module EESpecificCheck
run_git_command("status --porcelain") run_git_command("status --porcelain")
end end
def git_clean
run_git_command('clean -fd')
end
def remove_remotes def remove_remotes
run_git_command( run_git_command(
"remote remove canonical-ee", "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