diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
| commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
| tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /scripts/build_qa_image | |
| parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) | |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'scripts/build_qa_image')
| -rwxr-xr-x | scripts/build_qa_image | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/build_qa_image b/scripts/build_qa_image index 477bec29ba7..3728608e32c 100755 --- a/scripts/build_qa_image +++ b/scripts/build_qa_image @@ -1,9 +1,11 @@ #!/bin/bash QA_IMAGE_NAME="gitlab-ee-qa" +QA_BUILD_TARGET="ee" if [[ "${CI_PROJECT_NAME}" == "gitlabhq" || "${CI_PROJECT_NAME}" == "gitlab-foss" ]]; then QA_IMAGE_NAME="gitlab-ce-qa" + QA_BUILD_TARGET="foss" fi # Tag with commit SHA by default @@ -36,7 +38,7 @@ docker buildx build \ --build-arg=CHROME_VERSION="${CHROME_VERSION}" \ --build-arg=DOCKER_VERSION="${DOCKER_VERSION}" \ --build-arg=RUBY_VERSION="${RUBY_VERSION}" \ - --build-arg=QA_BUILD_TARGET="${QA_BUILD_TARGET:-qa}" \ + --build-arg=QA_BUILD_TARGET="${QA_BUILD_TARGET}" \ --file="${CI_PROJECT_DIR}/qa/Dockerfile" \ --push \ ${DESTINATIONS} \ |