From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 7 Apr 2022 08:05:34 +0000 (+0200)
Subject: ci: fix ambiguous tag-sets
X-Git-Tag: v5.5.1~20^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0a3c721efdfa9533427b45d044621cb68a53d9b;p=thirdparty%2Fknot-resolver.git

ci: fix ambiguous tag-sets

In a few places the tag-set specification for jobs could match
either amd64 or arm64 runners.  That non-determinism is bad,
especially when passing platform-specific artifacts around.

This is just a stop-gap measure.  Later we'll need to rethink our CI
in terms of the two platforms.

I didn't touch tag-sets with `condor`, as that will probably always be
just a single machine (which coordinates scheduling on others).
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac0ba28cd..b092a5837 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,6 +119,7 @@ docker:
   image: docker:latest
   tags:
     - dind
+    - amd64
   variables:
     DOCKER_IMAGE_NAME: knot-resolver-test:${CI_COMMIT_SHA}
   script:
@@ -287,6 +288,7 @@ deckard:
     - branches@knot/security/knot-resolver
   tags:
     - privileged
+    - amd64
   variables:
     TMPDIR: $CI_PROJECT_DIR
   script:
@@ -702,6 +704,7 @@ obs:ubuntu2110:x86_64:
   needs: []
   tags:
     - dind
+    - amd64
   variables:
     DISTRO: debian_10
   script: