diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-03 22:52:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-03 22:52:11 +0000 |
| commit | c0614f613d115e73b1bcf2112bcd4df64514cf2a (patch) | |
| tree | 2bbf8b5403949c724e1e9a68f4c87929fe5ad483 | |
| parent | 1c4601b001e9e41a9cdefc97a7b212475a34d626 (diff) | |
| download | gitlab-ce-c0614f613d115e73b1bcf2112bcd4df64514cf2a.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 5 |
1 files changed, 4 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 0d30cb78be7..2faea46e7d3 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -124,6 +124,8 @@ trigger-omnibus-env: echo "OMNIBUS_GITLAB_RUBY3_BUILD=${OMNIBUS_GITLAB_RUBY3_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 == '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: @@ -155,9 +157,10 @@ trigger-omnibus: CACHE_EDITION: $OMNIBUS_GITLAB_CACHE_EDITION SKIP_QA_DOCKER: "true" SKIP_QA_TEST: "true" - ee: "true" + ee: $EE trigger: project: gitlab-org/build/omnibus-gitlab-mirror + branch: $TRIGGER_BRANCH strategy: depend download-knapsack-report: |