From a3c21f4ba7f53d7112c0723ae144ac3836cf89ed Mon Sep 17 00:00:00 2001 From: Alex Ives Date: Tue, 28 Jun 2022 10:15:31 -0500 Subject: [PATCH 1/2] Pass UPSTREAM_GIT_URL to database testing Relates to https://gitlab.com/gitlab-org/database-team/gitlab-com-database-testing/-/issues/35 --- scripts/trigger-build.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/trigger-build.rb b/scripts/trigger-build.rb index 28b52fa916abef..955d9e6494683e 100755 --- a/scripts/trigger-build.rb +++ b/scripts/trigger-build.rb @@ -405,7 +405,8 @@ def extra_variables # Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts due to pipeline for merged results # and fallback to CI_COMMIT_SHA for the `detached` pipelines. 'GITLAB_COMMIT_SHA' => Trigger.non_empty_variable_value('CI_MERGE_REQUEST_SOURCE_BRANCH_SHA') || ENV['CI_COMMIT_SHA'], - 'TRIGGERED_USER_LOGIN' => ENV['GITLAB_USER_LOGIN'] + 'TRIGGERED_USER_LOGIN' => ENV['GITLAB_USER_LOGIN'], + 'UPSTREAM_GIT_URL' => ENV['CI_REPOSITORY_URL'] } end -- GitLab From b4ea00f615f571455bf6d5fba20e87a09c32f865 Mon Sep 17 00:00:00 2001 From: Alex Ives Date: Tue, 28 Jun 2022 10:26:04 -0500 Subject: [PATCH 2/2] DO NOT MERGE Testing for https://gitlab.com/gitlab-org/database-team/gitlab-com-database-testing/-/issues/35 --- db/migrate/20220628152430_no_op_for_testing.rb | 10 ++++++++++ db/schema_migrations/20220628152430 | 1 + scripts/trigger-build.rb | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20220628152430_no_op_for_testing.rb create mode 100644 db/schema_migrations/20220628152430 diff --git a/db/migrate/20220628152430_no_op_for_testing.rb b/db/migrate/20220628152430_no_op_for_testing.rb new file mode 100644 index 00000000000000..4ec79d68f0e316 --- /dev/null +++ b/db/migrate/20220628152430_no_op_for_testing.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +# See https://docs.gitlab.com/ee/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class NoOpForTesting < Gitlab::Database::Migration[2.0] + def change + puts "nope not running anything TBH" + end +end diff --git a/db/schema_migrations/20220628152430 b/db/schema_migrations/20220628152430 new file mode 100644 index 00000000000000..124b6d2d316d83 --- /dev/null +++ b/db/schema_migrations/20220628152430 @@ -0,0 +1 @@ +c0fbbb74f47e3e380c3e59bba0826e82ba4dfdb1809527812e0c4cad98a04c75 \ No newline at end of file diff --git a/scripts/trigger-build.rb b/scripts/trigger-build.rb index 955d9e6494683e..7eaf9186491d46 100755 --- a/scripts/trigger-build.rb +++ b/scripts/trigger-build.rb @@ -415,7 +415,7 @@ def ref_param_name end def primary_ref - 'master' + 'allow_forks' end end -- GitLab