diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 50b0b3531c76c2417d0eb36df2a9b7142a611d5e..972412cc94ac30bddf612ea76f95cf6c1a82341b 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -380,6 +380,15 @@ ee:update-major: - if: $QA_SUITES =~ /Test::Instance::Smoke/ - !reference [.rules:test:manual, rules] +ee:gitab-pages: + extends: .qa + variables: + QA_SCENARIO: Test::Integration::GitlabPages + rules: + - !reference [.rules:test:qa, rules] + - if: $QA_SUITES =~ /Test::Integration::GitlabPages/ + - !reference [.rules:test:manual, rules] + ee:gitaly-cluster: extends: .qa variables: diff --git a/qa/qa/scenario/test/instance/gitlab_pages.rb b/qa/qa/scenario/test/instance/gitlab_pages.rb new file mode 100644 index 0000000000000000000000000000000000000000..487fd739626bbe266a488a0b22201b7f56d9748e --- /dev/null +++ b/qa/qa/scenario/test/instance/gitlab_pages.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module QA + module Scenario + module Test + module Instance + class GitlabPages < All + tags :gitlab_pages + end + end + end + end +end diff --git a/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb b/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb index 1382a584833610880f87b13409e5a83990b6b450..c35aa403bfaacf3bea8799284d54ccf4c682c641 100644 --- a/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb @@ -1,8 +1,9 @@ # frozen_string_literal: true + module QA - RSpec.describe 'Create', :runner, only: { subdomain: :staging }, product_group: :editor do + RSpec.describe 'Create', :gitlab_pages, :orchestrated, except: { job: 'review-qa-*', subdomain: :production } do # TODO: Convert back to :smoke once proved to be stable. Related issue: https://gitlab.com/gitlab-org/gitlab/-/issues/300906 - describe 'Pages' do + describe 'Pages', product_group: :editor do let!(:project) do Resource::Project.fabricate_via_api! do |project| project.name = 'jekyll-pages-project' @@ -21,7 +22,6 @@ module QA before do Flow::Login.sign_in - Resource::Runner.fabricate_via_api! do |runner| runner.project = project runner.executor = :docker