From a260bd20097610a1ab3fb6c88fcf16ad16852a7e Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <jen-shin@gitlab.com>
Date: Tue, 20 Feb 2024 01:10:09 +0800
Subject: [PATCH] Fix detecting jest job for FOSS pipeline
---
scripts/setup/generate-as-if-foss-env.rb | 10 +++++++---
spec/scripts/setup/generate_as_if_foss_env_spec.rb | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/scripts/setup/generate-as-if-foss-env.rb b/scripts/setup/generate-as-if-foss-env.rb
index 35fc4dfe4498b..e0a3dbddd74a9 100755
--- a/scripts/setup/generate-as-if-foss-env.rb
+++ b/scripts/setup/generate-as-if-foss-env.rb
@@ -15,8 +15,6 @@ class GenerateAsIfFossEnv
eslint
generate-apollo-graphql-schema
graphql-schema-dump
- jest
- jest-integration
qa:internal
qa:selectors
static-analysis
@@ -76,7 +74,13 @@ def detect_rspec(job)
end
def detect_other_jobs(job)
- other_jobs << job.name if FOSS_JOBS.member?(job.name)
+ if FOSS_JOBS.member?(job.name)
+ other_jobs << job.name
+ else
+ jest_type = job.name[%r{^(jest(?:-\w+)?)(?: \d+/\d+)?$}, 1]
+
+ other_jobs << jest_type if jest_type
+ end
end
def rspec_variables
diff --git a/spec/scripts/setup/generate_as_if_foss_env_spec.rb b/spec/scripts/setup/generate_as_if_foss_env_spec.rb
index 2b94ce5bb0c9e..bafe306bbe5bf 100644
--- a/spec/scripts/setup/generate_as_if_foss_env_spec.rb
+++ b/spec/scripts/setup/generate_as_if_foss_env_spec.rb
@@ -39,7 +39,7 @@
'eslint',
'generate-apollo-graphql-schema',
'graphql-schema-dump',
- 'jest',
+ 'jest 1/5',
'jest-integration',
'qa:internal',
'qa:selectors',
--
GitLab