Merge branch 'acunskis-buildkit-build-images' into 'master'

Build qa-image with buildkit

See merge request gitlab-org/gitlab!66235

.gitlab/ci/build-images.gitlab-ci.yml

@@ -24,12 +24,47 @@ build-qa-image:
     - .base-image-build
     - .build-images:rules:build-qa-image
   stage: build-images
+  tags:
+    - high-cpu
   needs: []
   script:
     - !reference [.base-image-build, script]
     - echo $QA_IMAGE
     - /kaniko/executor --context=${CI_PROJECT_DIR} --dockerfile=${CI_PROJECT_DIR}/qa/Dockerfile --destination=${QA_IMAGE} --cache=true
 
+# This image is used by:
+# - The `review-qa-*` jobs
+# - The downstream `omnibus-gitlab-mirror` pipeline triggered by `package-and-qa` so that it doesn't have to rebuild it again.
+#   The downstream `omnibus-gitlab-mirror` pipeline itself passes the image name to the `gitlab-qa-mirror` pipeline so that
+#   it can use it instead of inferring an end-to-end image from the GitLab image built by the downstream `omnibus-gitlab-mirror` pipeline.
+# See https://docs.gitlab.com/ee/development/testing_guide/end_to_end/index.html#testing-code-in-merge-requests for more details.
+build-qa-image-buildkit:
+  extends:
+    - .base-image-build
+    - .use-buildkit
+    - .build-images:rules:build-qa-image
+  stage: build-images
+  tags:
+    - docker
+    - high-cpu
+  needs: []
+  variables:
+    QA_IMAGE_BASE: ${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa
+  allow_failure: true
+  script:
+    - !reference [.base-image-build, script]
+    # Build image and push current sha tag and latest branch tag
+    # Fetch cache from latest branch image or latest main branch image
+    - |
+      buildctl-daemonless.sh build \
+        --frontend=dockerfile.v0 \
+        --local context="." \
+        --local dockerfile="qa" \
+        --export-cache type=inline \
+        --import-cache type=registry,ref="${QA_IMAGE_BASE}:${CI_COMMIT_REF_SLUG}-buildkit" \
+        --import-cache type=registry,ref="${QA_IMAGE_BASE}:${CI_DEFAULT_BRANCH}" \
+        --output type=image,\"name="${QA_IMAGE}-buildkit","${QA_IMAGE_BASE}:${CI_COMMIT_REF_SLUG}-buildkit"\",push=true
+
 # This image is used by:
 # - The `CNG` pipelines (via the `review-build-cng` job): https://gitlab.com/gitlab-org/build/CNG/-/blob/cfc67136d711e1c8c409bf8e57427a644393da2f/.gitlab-ci.yml#L335
 # - The `omnibus-gitlab` pipelines (via the `package-and-qa` job): https://gitlab.com/gitlab-org/omnibus-gitlab/-/blob/dfd1ad475868fc84e91ab7b5706aa03e46dc3a86/.gitlab-ci.yml#L130

.gitlab/ci/global.gitlab-ci.yml

@@ -268,6 +268,24 @@
     - mkdir -p /kaniko/.docker
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
 
+.use-buildkit:
+  image:
+    name: ${GITLAB_DEPENDENCY_PROXY}moby/buildkit:v0.9.0
+    entrypoint: [""]
+  before_script:
+    - source scripts/utils.sh
+    - mkdir -p $HOME/.docker
+    - |
+      cat <<- EOF > $HOME/.docker/config.json
+      {
+        "auths": {
+          "$CI_REGISTRY": {
+            "auth": "$(echo -n $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD | base64)"
+          }
+        }
+      }
+      EOF
+
 .as-if-foss:
   variables:
     FOSS_ONLY: '1'