diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-06 18:10:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-06 18:10:28 +0000 |
| commit | 958f41148d08b03a9bbe37adecd6e3b0b10a7219 (patch) | |
| tree | 5998b3443f6b425b982857a078b95997f5231309 /scripts | |
| parent | b333706699e505b2a0a4fa9cc64b9d2358f271a5 (diff) | |
| download | gitlab-ce-958f41148d08b03a9bbe37adecd6e3b0b10a7219.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/generate-e2e-pipeline | 17 | ||||
| -rwxr-xr-x | scripts/trigger-build.rb | 5 |
2 files changed, 9 insertions, 13 deletions
diff --git a/scripts/generate-e2e-pipeline b/scripts/generate-e2e-pipeline index 697c4371d3b..8f5046ef32c 100755 --- a/scripts/generate-e2e-pipeline +++ b/scripts/generate-e2e-pipeline @@ -18,8 +18,9 @@ if [ "$QA_SKIP_ALL_TESTS" == "true" ]; then exit fi -common_variables=$(cat <<YML +variables=$(cat <<YML variables: + GITLAB_VERSION: "$(cat VERSION)" QA_TESTS: "$QA_TESTS" QA_FEATURE_FLAGS: "${QA_FEATURE_FLAGS}" QA_FRAMEWORK_CHANGES: "${QA_FRAMEWORK_CHANGES:-false}" @@ -30,17 +31,11 @@ YML echo "Using .gitlab/ci/review-apps/main.gitlab-ci.yml and .gitlab/ci/package-and-test/main.gitlab-ci.yml" cp .gitlab/ci/review-apps/main.gitlab-ci.yml "$REVIEW_PIPELINE_YML" -echo "$common_variables" >>"$REVIEW_PIPELINE_YML" +echo "$variables" >>"$REVIEW_PIPELINE_YML" echo "Successfully generated review-app pipeline with following variables section:" -echo -e "$common_variables" +echo "$variables" -omnibus_variables=$(cat <<YML - RELEASE: "${CI_REGISTRY}/gitlab-org/build/omnibus-gitlab-mirror/gitlab-ee:${CI_COMMIT_SHA}" - OMNIBUS_GITLAB_CACHE_UPDATE: "${OMNIBUS_GITLAB_CACHE_UPDATE:-false}" -YML -) cp .gitlab/ci/package-and-test/main.gitlab-ci.yml "$OMNIBUS_PIPELINE_YML" -echo "$common_variables" >>"$OMNIBUS_PIPELINE_YML" -echo "$omnibus_variables" >>"$OMNIBUS_PIPELINE_YML" +echo "$variables" >>"$OMNIBUS_PIPELINE_YML" echo "Successfully generated package-and-test pipeline with following variables section:" -echo -e "${common_variables}\n${omnibus_variables}" +echo "$variables" diff --git a/scripts/trigger-build.rb b/scripts/trigger-build.rb index 75f3967cb4a..b2bf2d5c680 100755 --- a/scripts/trigger-build.rb +++ b/scripts/trigger-build.rb @@ -389,8 +389,9 @@ module Trigger def extra_variables { - 'GITLAB_COMMIT_SHA' => ENV['CI_COMMIT_SHA'], - 'TRIGGERED_USER_LOGIN' => ENV['GITLAB_USER_LOGIN'] + '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'], + 'TOP_UPSTREAM_SOURCE_SHA' => Trigger.non_empty_variable_value('CI_MERGE_REQUEST_SOURCE_BRANCH_SHA') || ENV['CI_COMMIT_SHA'] } end |