VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-23 00:47:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2025-01-21 13:34:02 +00:00
parent c4ccf11a4e
commit ff9ac78d7d
15 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab/ci/test-on-omnibus-nightly/main.gitlab-ci.yml
View File

@ -6,7 +6,7 @@ include:
workflow:
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $SCHEDULE_TYPE == "nightly"'
- when: always
# ==========================================
# Prepare stage
@ -103,7 +103,6 @@ relative-url:
# ------------------------------------------
# Registry with CDN
# ------------------------------------------
registry-with-cdn:
extends:
- .qa
@ -118,7 +117,6 @@ registry-with-cdn:
# ------------------------------------------
# Object Storage with MiniO
# ------------------------------------------
object-storage:
extends:
- .qa
@ -130,7 +128,6 @@ object-storage:
# ------------------------------------------
# Object Storage with AWS
# ------------------------------------------
object-storage-aws:
extends:
- object-storage
@ -144,7 +141,6 @@ object-storage-aws:
# ------------------------------------------
# Object Storage with GCS
# ------------------------------------------
object-storage-gcs:
extends:
- object-storage
@ -182,14 +178,9 @@ gitlab-pages:
- .qa
variables:
QA_SCENARIO: Test::Integration::GitlabPages
rules:
- !reference [.rules:test:qa, rules]
- if: $QA_SUITES =~ /Test::Instance::GitlabPages/
- !reference [.rules:test:manual, rules]
# ========== git sha256 enabled ===========
git-sha256-repositories:
when: manual
extends:
- .parallel
- .qa
@ -198,9 +189,6 @@ git-sha256-repositories:
QA_SCENARIO: Test::Instance::Image
QA_USE_SHA256_REPOSITORY_OBJECT_STORAGE: true
GITLAB_QA_OPTS: "--enable-feature support_sha256_repositories"
rules:
- !reference [.rules:test:qa-parallel, rules]
- if: $QA_SUITES =~ /Test::Instance::All/
# ========== Update From Previous with AI components ===========
update-minor-ee-ai-components:

2
GITLAB_KAS_VERSION
View File

@ -1 +1 @@
eb969b365e75ba081eebc768e59e546c915ea185
e867941379c22e2656fc0f620a57e0aefafaad40

2
config/feature_flags/beta/vue_merge_request_list.yml
View File

@ -6,4 +6,4 @@ rollout_issue_url:
milestone: '16.10'
group: group::code review
type: beta
default_enabled: false
default_enabled: true

13
db/post_migrate/20250115122257_drop_stage_column_from_ci_builds.rb Normal file
View File

@ -0,0 +1,13 @@
# frozen_string_literal: true
class DropStageColumnFromCiBuilds < Gitlab::Database::Migration[2.2]
milestone '17.9'
def up
remove_column :p_ci_builds, :stage
end
def down
add_column :p_ci_builds, :stage, :string
end
end

1
db/schema_migrations/20250115122257 Normal file
View File

@ -0,0 +1 @@
6d155316066300d2b448407687f1e7bbc6b5e49285df0de2f9261fc2d20523c2

2
db/structure.sql
View File

@ -3630,7 +3630,6 @@ CREATE TABLE p_ci_builds (
name character varying,
options text,
allow_failure boolean DEFAULT false NOT NULL,
stage character varying,
stage_idx integer,
tag boolean,
ref character varying,
@ -9713,7 +9712,6 @@ CREATE TABLE ci_builds (
name character varying,
options text,
allow_failure boolean DEFAULT false NOT NULL,
stage character varying,
stage_idx integer,
tag boolean,
ref character varying,

4
qa/qa/scenario/test/instance/airgapped.rb
View File

@ -8,6 +8,10 @@ module QA
include Bootable
include SharedAttributes
tags "~github", "~external_api_calls", "~skip_live_env", *Specs::Runner::DEFAULT_SKIPPED_TAGS
pipeline_mappings test_on_omnibus_nightly: ["airgapped"]
def perform(address, *rspec_options)
Runtime::Scenario.define(:network, 'airgapped')

8
qa/qa/scenario/test/instance/all.rb
View File

@ -14,6 +14,14 @@ module QA
pipeline_mappings test_on_cng: %w[cng-instance],
test_on_gdk: %w[gdk-instance gdk-instance-gitaly-transactions gdk-instance-ff-inverse],
test_on_omnibus_nightly: %w[
instance-image-slow-network
nplus1-instance-image
relative-url
decomposition-single-db
decomposition-multiple-db
git-sha256-repositories
],
test_on_omnibus: %w[
instance
praefect

2
qa/qa/scenario/test/instance/gitlab_pages.rb
View File

@ -6,6 +6,8 @@ module QA
module Instance
class GitlabPages < All
tags :gitlab_pages
pipeline_mappings test_on_omnibus_nightly: %w[gitlab-pages]
end
end
end

2
qa/qa/scenario/test/instance/object_storage.rb
View File

@ -6,6 +6,8 @@ module QA
module Instance
class ObjectStorage < All
tags :object_storage
pipeline_mappings test_on_omnibus_nightly: %w[object-storage object-storage-aws object-storage-gcs]
end
end
end

4
qa/qa/scenario/test/integration/registry.rb
View File

@ -7,7 +7,9 @@ module QA
class Registry < Test::Instance::All
tags :registry
pipeline_mappings test_on_cng: ["cng-registry"], test_on_omnibus: %w[registry]
pipeline_mappings test_on_cng: %w[cng-registry],
test_on_omnibus: %w[registry],
test_on_omnibus_nightly: %w[registry-with-cdn]
end
end
end

4
qa/qa/specs/runner.rb
View File

@ -14,7 +14,7 @@ module QA
DEFAULT_TEST_PATH = "qa/specs/features"
DEFAULT_TEST_PATH_ARGS = [DEFAULT_TEST_PATH].freeze
DEFAULT_STD_ARGS = [$stderr, $stdout].freeze
DEFAULT_SKIPPED_TAGS = %w[orchestrated].freeze
DEFAULT_SKIPPED_TAGS = %w[~orchestrated].freeze
def initialize
@tty = false
@ -46,7 +46,7 @@ module QA
if tags.any?
tags.each { |tag| tags_for_rspec.push(tag.to_s) }
else
tags_for_rspec.push(*DEFAULT_SKIPPED_TAGS.map { |tag| "~#{tag}" }) unless (%w[-t --tag] & options).any?
tags_for_rspec.push(*DEFAULT_SKIPPED_TAGS) unless (%w[-t --tag] & options).any?
end
tags_for_rspec.push("~geo") unless QA::Runtime::Env.geo_environment?

2
qa/qa/support/example_data.rb
View File

@ -17,7 +17,7 @@ module QA
logger.debug("Fetching example data for tags '#{tags}' and specs '#{specs}'")
Tempfile.open("test-metadata.json") do |file|
tags = tags.presence || Specs::Runner::DEFAULT_SKIPPED_TAGS.map { |tag| "~#{tag}" }
tags = tags.presence || Specs::Runner::DEFAULT_SKIPPED_TAGS
args = [
"--dry-run",
"--no-color",

1
qa/spec/scenario/test/instance/airgapped_spec.rb
View File

@ -3,6 +3,7 @@
RSpec.describe QA::Scenario::Test::Instance::Airgapped do
describe '#perform' do
it_behaves_like 'a QA scenario class' do
let(:tags) { %w[~github ~external_api_calls ~skip_live_env ~orchestrated] }
end
end
end

2
qa/spec/support/example_data_spec.rb
View File

@ -10,7 +10,7 @@ RSpec.describe QA::Support::ExampleData do
let(:tags) { [] }
let(:spec_files) { [] }
let(:default_tags) { QA::Specs::Runner::DEFAULT_SKIPPED_TAGS.map { |tag| "~#{tag}" } }
let(:default_tags) { QA::Specs::Runner::DEFAULT_SKIPPED_TAGS }
let(:default_spec_files) { QA::Specs::Runner::DEFAULT_TEST_PATH_ARGS - ["--"] }
before do