Commit 89a0c23f authored by Lin Jen-Shin's avatar Lin Jen-Shin

Skip master for EE-specific check

master is a special case that CE master is not crafted toward
EE master, thus it could be ahead of EE master. In this case
we should compare with the merge-base, but that could make
the code unnecessarily complex and is not worth the effort.
parent 976e2e11
...@@ -447,29 +447,27 @@ retrieve-tests-metadata: ...@@ -447,29 +447,27 @@ retrieve-tests-metadata:
- wget -O $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH - wget -O $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH
- '[[ -f $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH}' - '[[ -f $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH}'
ee-files-location-check: .ee-specific-check: &ee-specific-check
<<: *dedicated-runner <<: *dedicated-runner
stage: test stage: test
before_script: [] before_script: []
cache: {} cache: {}
retry: 0 retry: 0
script:
- scripts/ee-files-location-check
only: only:
- branches - branches
- //@gitlab-org/gitlab-ee - //@gitlab-org/gitlab-ee
except:
- master
ee-files-location-check:
<<: *ee-specific-check
script:
- scripts/ee-files-location-check
ee-specific-lines-check: ee-specific-lines-check:
<<: *dedicated-runner <<: *ee-specific-check
stage: test
before_script: []
cache: {}
retry: 0
script: script:
- scripts/ee-specific-lines-check - scripts/ee-specific-lines-check
only:
- branches
- //@gitlab-org/gitlab-ee
update-tests-metadata: update-tests-metadata:
<<: *tests-metadata-state <<: *tests-metadata-state
......
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