diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 04:41:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-04 04:41:48 +0000 |
| commit | 0d6ce4eb74b051d81e71fab228b6927e807df88d (patch) | |
| tree | e06d63242ef9078ce67cab23054c5459d16b84ff | |
| parent | 3db14bcbaf08ac4c2f2cebf341bbce0ab29d6c20 (diff) | |
| download | gitlab-ce-0d6ce4eb74b051d81e71fab228b6927e807df88d.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-10-stable-ee
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 4c89cbb721b..d5446fda3ac 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -127,7 +127,8 @@ trigger-omnibus-env: echo "OMNIBUS_GITLAB_RUBY2_BUILD=${OMNIBUS_GITLAB_RUBY2_BUILD:-false}" >> $BUILD_ENV echo "OMNIBUS_GITLAB_CACHE_EDITION=${OMNIBUS_GITLAB_CACHE_EDITION:-GITLAB}" >> $BUILD_ENV echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV - echo "EE=$([[ $FOSS_ONLY == 'true' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV + echo "EE=$([[ $FOSS_ONLY == '1' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV + echo "TRIGGER_BRANCH=$([[ "$CI_COMMIT_REF_NAME" =~ ^[0-9-]+-stable(-ee)?$ ]] && echo ${CI_COMMIT_REF_NAME%-ee} || echo 'master')" >> $BUILD_ENV echo "Built environment file for omnibus build:" cat $BUILD_ENV artifacts: @@ -162,6 +163,7 @@ trigger-omnibus: ee: $EE trigger: project: gitlab-org/build/omnibus-gitlab-mirror + branch: $TRIGGER_BRANCH strategy: depend download-knapsack-report: |