Skip to content
Snippets Groups Projects
Verified Commit 41bc871f authored by Sanad Liaquat's avatar Sanad Liaquat Committed by GitLab
Browse files

Merge branch 'hm-try-fix-ff-inverse-job-timeout' into 'master'

Add gdk-instance-ff-inverse in processing dynamic jobs

See merge request !178102



Merged-by: default avatarSanad Liaquat <sliaquat@gitlab.com>
Approved-by: default avatarSanad Liaquat <sliaquat@gitlab.com>
Co-authored-by: default avatarhmuralidhar <hmuralidhar@gitlab.com>
parents 0388d4b5 fa6ada2a
No related branches found
No related tags found
3 merge requests!181325Fix ambiguous `created_at` in project.rb,!179611Draft: Rebase CR approach for zoekt assignments,!178102Add gdk-instance-ff-inverse in processing dynamic jobs
Pipeline #1628025635 passed
......@@ -13,7 +13,7 @@ class All < Template
include SharedAttributes
pipeline_mappings test_on_cng: %w[cng-instance],
test_on_gdk: %w[gdk-instance gdk-instance-gitaly-transactions],
test_on_gdk: %w[gdk-instance gdk-instance-gitaly-transactions gdk-instance-ff-inverse],
test_on_omnibus: %w[
instance
praefect
......
......@@ -42,8 +42,10 @@ namespace :ci do
next pipeline_creator.create_noop
end
feature_flags_changes = QA::Tools::Ci::FfChanges.new(diff).fetch
# on run-all label or framework changes do not infer specific tests
run_all_tests = run_all_label_present || qa_changes.framework_changes?
run_all_tests = run_all_label_present || qa_changes.framework_changes? ||
!feature_flags_changes.nil?
tests = run_all_tests ? [] : qa_changes.qa_tests
if run_all_label_present
......@@ -59,7 +61,7 @@ namespace :ci do
creator_args = {
pipeline_path: pipeline_path,
logger: logger,
env: { "QA_FEATURE_FLAGS" => QA::Tools::Ci::FfChanges.new(diff).fetch }
env: { "QA_FEATURE_FLAGS" => feature_flags_changes }
}
logger.info("*** Creating E2E test pipeline definitions ***")
......
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