Skip to content
代码片段 群组 项目
未验证 提交 7eff5681 编辑于 作者: Tiffany Rea's avatar Tiffany Rea 提交者: GitLab
浏览文件

Merge branch 'sv-composer-e2e-test-url' into 'master'

Fix Composer E2E test from quarantine

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147806



Merged-by: default avatarTiffany Rea <trea@gitlab.com>
Approved-by: default avatarValerie Burton <vburton@gitlab.com>
Approved-by: default avatarTiffany Rea <trea@gitlab.com>
Co-authored-by: default avatarSofia Vistas <svistas@gitlab.com>
No related branches found
No related tags found
无相关合并请求
......@@ -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 "")
......
# 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
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册