diff --git a/qa/qa/fixtures/package_managers/composer/composer_upload_package.yaml.erb b/qa/qa/fixtures/package_managers/composer/composer_upload_package.yaml.erb index 5ebb2a0d8f3c31ad93db040cbca764bf486d129c..6867e3970829fcad69243052f1a8be1e31e7fe21 100644 --- a/qa/qa/fixtures/package_managers/composer/composer_upload_package.yaml.erb +++ b/qa/qa/fixtures/package_managers/composer/composer_upload_package.yaml.erb @@ -2,7 +2,7 @@ publish: image: curlimages/curl:latest stage: build variables: - URL: "<%= gitlab_host_with_port %>/api/v4/projects/$CI_PROJECT_ID/packages/composer?job_token=$CI_JOB_TOKEN" + URL: "<%= gitlab_address_without_port %>/api/v4/projects/$CI_PROJECT_ID/packages/composer?job_token=$CI_JOB_TOKEN" script: - version=$([[ -z "$CI_COMMIT_TAG" ]] && echo "branch=$CI_COMMIT_REF_NAME" || echo "tag=$CI_COMMIT_TAG") - insecure=$([ "$CI_SERVER_PROTOCOL" = "http" ] && echo "--insecure" || echo "") diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb index ac19ceb47aff4c2090b94b311810cede06bb68ad..5761c8bf989ed47c9d2c9aa42a447f0cc40899b8 100644 --- a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb +++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb @@ -1,10 +1,7 @@ # frozen_string_literal: true module QA - RSpec.describe 'Package', :object_storage, product_group: :package_registry, - quarantine: { only: { pipeline: %i[staging staging-canary canary production] }, - issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/439376', - type: :broken } do + RSpec.describe 'Package', :object_storage, product_group: :package_registry do describe 'Composer Repository', :external_api_calls do include Runtime::Fixtures @@ -19,7 +16,7 @@ module QA project: project) end - let(:gitlab_host_with_port) { Support::GitlabAddress.host_with_port } + let(:gitlab_address_without_port) { Support::GitlabAddress.address_with_port(with_default_port: false) } before do Flow::Login.sign_in