Commit 86544f72 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch '343639-fix-qa-failure' into 'master'

Fix `online_garbage_collection_spec.rb` QA failure

See merge request gitlab-org/gitlab!72888
parents 398ede31 e62beab7
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
module QA module QA
RSpec.describe 'Package' do RSpec.describe 'Package' do
describe 'Container Registry Online Garbage Collection', :registry_gc, only: { subdomain: %i[pre] } do # TODO: Remove :requires_admin when the `Runtime::Feature.enable` method call is removed
describe 'Container Registry Online Garbage Collection', :registry_gc, :requires_admin, only: { subdomain: %i[pre] } do
let(:group) { Resource::Group.fabricate_via_api! } let(:group) { Resource::Group.fabricate_via_api! }
let(:imported_project) do let(:imported_project) do
...@@ -23,12 +24,12 @@ module QA ...@@ -23,12 +24,12 @@ module QA
STAGE_THREE_VALIDATION_DELAY: "6m" STAGE_THREE_VALIDATION_DELAY: "6m"
STAGE_FOUR_VALIDATION_DELAY: "12m" STAGE_FOUR_VALIDATION_DELAY: "12m"
STAGE_FIVE_VALIDATION_DELAY: "12m" STAGE_FIVE_VALIDATION_DELAY: "12m"
stages: stages:
- generate - generate
- build - build
- test - test
.base: &base .base: &base
image: docker:19 image: docker:19
services: services:
...@@ -39,11 +40,11 @@ module QA ...@@ -39,11 +40,11 @@ module QA
DOCKER_TLS_VERIFY: 1 DOCKER_TLS_VERIFY: 1
DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client" DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
before_script: before_script:
- until docker info; do sleep 1; done - until docker info; do sleep 1; done
- mkdir -p $GOPATH - mkdir -p $GOPATH
- mkdir -p $BUILD_CACHE - mkdir -p $BUILD_CACHE
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
test: test:
stage: generate stage: generate
extends: .base extends: .base
...@@ -64,6 +65,8 @@ module QA ...@@ -64,6 +65,8 @@ module QA
end end
before do before do
Runtime::Feature.enable(:paginatable_namespace_drop_down_for_project_creation)
Flow::Login.sign_in Flow::Login.sign_in
imported_project imported_project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment