diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6acf982fd553baa6a4b095cc0397cb3f4d85752e..7191a80acb70ab7cbd6bb41ad6266888baaf2f4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,7 +183,7 @@ variables: CI_FETCH_REPO_GIT_STRATEGY: "none" DEBIAN_VERSION: "bullseye" UBI_VERSION: "8.6" - CHROME_VERSION: "113" + CHROME_VERSION: "119" DOCKER_VERSION: "24.0.5" RUBYGEMS_VERSION: "3.4" GO_VERSION: "1.20" diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 1159bccb1143b2f97df29e947cb627194729cfb0..d2bbc22625c8154f03ea639f8add7e9f2863747f 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -87,7 +87,6 @@ start-review-app-pipeline: # https://gitlab.com/gitlab-org/gitlab/-/issues/387183 inherit: variables: - - CHROME_VERSION - REGISTRY_GROUP - REGISTRY_HOST - REVIEW_APPS_DOMAIN @@ -96,6 +95,8 @@ start-review-app-pipeline: - REVIEW_APPS_IMAGE - RUBY_VERSION - DEBIAN_VERSION + - DOCKER_VERSION + - CHROME_VERSION # These variables are set in the pipeline schedules. # They need to be explicitly passed on to the child pipeline. diff --git a/ee/spec/features/groups/usage_quotas/pipelines_tab_spec.rb b/ee/spec/features/groups/usage_quotas/pipelines_tab_spec.rb index f4ceb51f946edcc79033b9eca8a2ca90d2d703ad..7d216acc63caac9a9ad8c63ef72859a0c6970296 100644 --- a/ee/spec/features/groups/usage_quotas/pipelines_tab_spec.rb +++ b/ee/spec/features/groups/usage_quotas/pipelines_tab_spec.rb @@ -129,7 +129,7 @@ create(:project, :with_ci_minutes, amount_used: 300, namespace: subgroup, shared_runners_enabled: true) end - it 'shows projects inside the subgroup' do + it 'shows projects inside the subgroup', quarantine: "https://gitlab.com/gitlab-org/gitlab/-/issues/437680" do visit_usage_quotas_page expect(page).to have_content(project.full_name) @@ -205,7 +205,8 @@ visit_usage_quotas_page('pipelines-quota-tab') end - it 'sorts projects list by compute used in descending order' do + it 'sorts projects list by compute used in descending order', + quarantine: "https://gitlab.com/gitlab-org/gitlab/-/issues/437680" do within_testid('pipelines-quota-tab-project-table') do expect(page).to have_content("Project") expect(page).to have_content("Shared runner duration") @@ -224,7 +225,7 @@ end end - context 'with pagination' do + context 'with pagination', quarantine: "https://gitlab.com/gitlab-org/gitlab/-/issues/437680" do include_context 'when user is allowed to see usage quotas' let(:per_page) { 1 } diff --git a/qa/Dockerfile b/qa/Dockerfile index 1a6a670bf96d2beee0582cfe2d1cc163d3e8bc44..9911d2a293085c4e4972e88e6a8344b9c7c61750 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,5 +1,5 @@ ARG DOCKER_VERSION=24.0.5 -ARG CHROME_VERSION=113 +ARG CHROME_VERSION=119 ARG RUBY_VERSION=3.0 ARG QA_BUILD_TARGET=ee diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb index c0aaa7f818a9b359e87b6ba3212a08289e97429a..aac2e3c4e46870f0eb2860ca724bb5eafbfd357a 100644 --- a/spec/features/groups_spec.rb +++ b/spec/features/groups_spec.rb @@ -205,7 +205,10 @@ describe 'not showing personalization questions on group creation when it is enabled' do before do stub_application_setting(hide_third_party_offers: true) - visit new_group_path(anchor: 'create-group-pane') + + # If visiting directly via path, personalization setting is not being picked up correctly + visit new_group_path + click_link 'Create group' end it 'does not render personalization questions' do @@ -350,10 +353,16 @@ visit path end - it_behaves_like 'dirty submit form', [{ form: '.js-general-settings-form', input: 'input[name="group[name]"]', submit: 'button[type="submit"]' }, - { form: '.js-general-settings-form', input: '#group_visibility_level_0', submit: 'button[type="submit"]' }, - { form: '.js-general-permissions-form', input: '#group_request_access_enabled', submit: 'button[type="submit"]' }, - { form: '.js-general-permissions-form', input: 'input[name="group[two_factor_grace_period]"]', submit: 'button[type="submit"]' }] + it_behaves_like 'dirty submit form', [ + { form: '.js-general-settings-form', input: 'input[name="group[name]"]', submit: 'button[type="submit"]' }, + { form: '.js-general-settings-form', input: '#group_visibility_level_0', submit: 'button[type="submit"]' }, + { form: '.js-general-permissions-form', input: '#group_request_access_enabled', submit: 'button[type="submit"]' }, + { + form: '.js-general-permissions-form', + input: 'input[name="group[two_factor_grace_period]"]', + submit: 'button[type="submit"]' + } + ] it 'saves new settings' do page.within('.gs-general') do