diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-11 12:09:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-11 12:09:05 +0000 |
| commit | 28e90894e1e6f17320f5b1d2fff6fe736bf65dff (patch) | |
| tree | 21d63bf124b6064eb1650acc3e2aabe6dbc99f58 /scripts | |
| parent | a48957b317edf23b1bcfc6df0c098a824eae86f4 (diff) | |
| download | gitlab-ce-28e90894e1e6f17320f5b1d2fff6fe736bf65dff.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/generate-e2e-pipeline | 1 | ||||
| -rw-r--r-- | scripts/utils.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/generate-e2e-pipeline b/scripts/generate-e2e-pipeline index 001644ddc14..c0d17443ba9 100755 --- a/scripts/generate-e2e-pipeline +++ b/scripts/generate-e2e-pipeline @@ -32,6 +32,7 @@ variables: QA_FEATURE_FLAGS: "${QA_FEATURE_FLAGS}" QA_FRAMEWORK_CHANGES: "${QA_FRAMEWORK_CHANGES:-false}" QA_RUN_ALL_TESTS: "${QA_RUN_ALL_TESTS:-false}" + QA_RUN_ALL_E2E_LABEL: "${QA_RUN_ALL_E2E_LABEL:-false}" QA_SAVE_TEST_METRICS: "${QA_SAVE_TEST_METRICS:-false}" QA_SUITES: "$QA_SUITES" QA_TESTS: "$QA_TESTS" diff --git a/scripts/utils.sh b/scripts/utils.sh index df8a5825dab..80057842c28 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -76,7 +76,7 @@ function bundle_install_script() { gem --version bundle --version - gem install bundler --no-document --conservative --version 2.3.15 + gem install bundler --no-document --conservative --version 2.4.11 test -d jh && bundle config set --local gemfile 'jh/Gemfile' bundle config set path "$(pwd)/vendor" bundle config set clean 'true' |