diff options
Diffstat (limited to '.gitlab/ci/build-images.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/build-images.gitlab-ci.yml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/.gitlab/ci/build-images.gitlab-ci.yml b/.gitlab/ci/build-images.gitlab-ci.yml index 46d0bb2fb8f..3b360d66b7f 100644 --- a/.gitlab/ci/build-images.gitlab-ci.yml +++ b/.gitlab/ci/build-images.gitlab-ci.yml @@ -1,16 +1,9 @@ .base-image-build: extends: .use-kaniko + variables: + GIT_LFS_SKIP_SMUDGE: 1 script: - # With .git/hooks/post-checkout in place, Git tries to pull LFS objects, but the image doesn't have Git LFS, and we actually don't care about it for this specific so we just remove the file. - # Without removing the file, the error is as follows: "This repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/post-checkout." - - rm -f .git/hooks/post-checkout - - if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA" ]; then - echo "Checking out \$CI_MERGE_REQUEST_SOURCE_BRANCH_SHA ($CI_MERGE_REQUEST_SOURCE_BRANCH_SHA) instead of \$CI_COMMIT_SHA (merge result commit $CI_COMMIT_SHA) so that GitLab image built in omnibus-gitlab-mirror and QA image are in sync."; - git checkout -f ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}; - else - echo "Building the image from \$CI_COMMIT_SHA ($CI_COMMIT_SHA) for this non-merge result pipeline."; - fi; - - echo "See https://docs.gitlab.com/ee/development/testing_guide/end_to_end/index.html#with-pipeline-for-merged-results for more details."; + - scripts/checkout-mr-source-sha retry: 2 # This image is used by: @@ -37,6 +30,7 @@ build-qa-image: --destination=${QA_IMAGE_BRANCH} \ --build-arg=CHROME_VERSION=${CHROME_VERSION} \ --build-arg=DOCKER_VERSION=${DOCKER_VERSION} \ + --build-arg=QA_BUILD_TARGET=${QA_BUILD_TARGET:-qa} \ --cache=true # This image is used by: |