Skip to content
Snippets Groups Projects
Verified Commit 504d6489 authored by Mayra Cabrera's avatar Mayra Cabrera :zero: Committed by GitLab
Browse files

Merge branch 'cherry-pick-d512be4d-3' into '17-5-stable-ee'

Cherry-pick 'jennli-patch-compile-prod-assets-rules' into 17-5-stable-ee

See merge request !173594



Merged-by: default avatarMayra Cabrera <mcabrera@gitlab.com>
Approved-by: default avatarMayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: default avatarJennifer Li <jli@gitlab.com>
parents fc7a9c68 43c364e2
No related branches found
No related tags found
1 merge request!173594Cherry-pick 'jennli-patch-compile-prod-assets-rules' into 17-5-stable-ee
Pipeline #1556918478 passed with warnings
......@@ -1298,6 +1298,8 @@
- <<: *if-merge-request-labels-pipeline-expedite
when: never
- if: '$ENABLE_COMPILE_PRODUCTION_ASSETS == "true"'
- <<: *if-tag
- !reference [".release-environments:rules:start-release-environments-security-pipeline", rules]
- !reference [".frontend:rules:assets-shared", rules]
.frontend:rules:compile-test-assets:
......
......@@ -140,6 +140,19 @@
it_behaves_like 'default branch pipeline'
end
context 'with stable-ee branch pipeline' do
let(:ci_commit_branch) { '17-6-stable-ee' }
let(:expected_job_name) { 'compile-production-assets' }
# Test requires syncing CI file, which means the test project's latest commit includes CI file changes
# This results in `[".frontend:rules:assets-shared", rules]` always evaluates to true.
# If we don't want to test this specific condition
# Make sure you comment out `- !reference [".frontend:rules:assets-shared", rules]` everywhere
# before running this test scenario.
# Otherwise, this test case always passes.
it_behaves_like 'default branch pipeline'
end
end
context 'with gitlab.com gitlab-org gitlab-foss project' do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment