Merge pull request #437 from DataDog/mborst/k8s-based-CI-runners

[CI] Migrate to k8s-based CI runners
DataDog · Feb 16, 2024 · 82bc7ab · 82bc7ab
2 parents 6447050 + 4950413
commit 82bc7ab
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,11 +8,12 @@ build-staging:
   image: $DOCKER_IMAGE
   rules:
     - if: '$CI_COMMIT_REF_NAME != "master"'
-  tags: ["runner:docker"]
+  tags:
+    - "arch:amd64"
   script:
-    - docker build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=staging --target dd-image -f Dockerfile .
-    - docker push registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
-    - ddsign sign registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --digest-from-docker
+    - METADATA_FILE=$(mktemp)
+    - docker buildx build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=staging --target dd-image -f Dockerfile --push --metadata-file ${METADATA_FILE} .
+    - ddsign sign registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --docker-metadata-file ${METADATA_FILE}
 
 
 build-prod:
@@ -22,8 +23,9 @@ build-prod:
   image: $DOCKER_IMAGE
   rules:
     - if: '$CI_COMMIT_REF_NAME == "master"'
-  tags: ["runner:docker"]
+  tags:
+    - "arch:amd64"
   script:
-    - docker build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=prod --target dd-image -f Dockerfile .
-    - docker push registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
-    - ddsign sign registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --digest-from-docker
+    - METADATA_FILE=$(mktemp)
+    - docker buildx build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=prod --target dd-image -f Dockerfile --push --metadata-file ${METADATA_FILE} .
+    - ddsign sign registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --docker-metadata-file ${METADATA_FILE}