restore arm64 builds, cleanup obsolete tag vars

debian/.debian-ci.yml

@@ -63,7 +63,7 @@ default:
   timeout: 6h
   variables:
     GIT_STRATEGY: none
-  tags: [ $RUNNER_TAG, $HOSTING_PROVIDER_TAG, $PHYSICAL_TAG ]
+  tags: [ $HOSTING_PROVIDER_TAG, $DOCKER_ARCH ]
   before_script:
     - rm -rf build-env binary-packages
     - *apt-init
@@ -152,90 +152,29 @@ default:
   - OS: debian
     SUITE: [ 'sid', 'bullseye', 'bookworm', 'trixie' ]
     DOCKER_ARCH: amd64
-    RUNNER_TAG: amd64
     HOSTING_PROVIDER_TAG: tpa
-    PHYSICAL_TAG: tpa # we don't care about physical
-    #IMAGE_EXTENSION: '-slim'
-  #- OS: debian
-  #  SUITE: [ 'sid', 'buster', 'bullseye', 'bookworm', 'trixie' ]
-  #  DOCKER_ARCH: i386
-  #  RUNNER_TAG: amd64
-  #  HOSTING_PROVIDER_TAG: tpa
-  #  PHYSICAL_TAG: physical
-  #  IMAGE_EXTENSION: '-slim'
-  #  SPECIAL: [ '' ]
-  #- OS: debian
-  #  DOCKER_ARCH: 'arm64v8'
-  #  SUITE: [ 'sid', 'buster', 'bullseye', 'bookworm', 'trixie' ]
-  #  RUNNER_TAG: aarch64
-  #  HOSTING_PROVIDER_TAG: osuosl
-  #  PHYSICAL_TAG: osuosl # we don't care about physical
-  #  IMAGE_EXTENSION: '-slim'
-  #  SPECIAL: [ '' ]
+  - OS: debian
+    SUITE: [ 'sid', 'bullseye', 'bookworm', 'trixie' ]
+    DOCKER_ARCH: arm64
+    HOSTING_PROVIDER_TAG: osuosl
   - OS: debian
     SUITE: 'bullseye'
     DOCKER_ARCH: amd64
-    RUNNER_TAG: amd64
     HOSTING_PROVIDER_TAG: tpa
-    PHYSICAL_TAG: tpa # we don't care about physical
-    #IMAGE_EXTENSION: '-slim'
-    SPECIAL: [ 'bpo11' ]
-  #- OS: debian
-  #  SUITE: 'bullseye'
-  #  DOCKER_ARCH: i386
-  #  RUNNER_TAG: amd64
-  #  HOSTING_PROVIDER_TAG: tpa
-  #  PHYSICAL_TAG: physical
-  #  IMAGE_EXTENSION: '-slim'
-  #  SPECIAL: [ 'bpo11' ]
   - OS: debian
     SUITE: 'bookworm'
     DOCKER_ARCH: amd64
-    RUNNER_TAG: amd64
     HOSTING_PROVIDER_TAG: tpa
-    PHYSICAL_TAG: tpa # we don't care about physical
-    #IMAGE_EXTENSION: '-slim'
     SPECIAL: [ 'bpo12' ]
-  #- OS: debian
-  #  SUITE: 'bookworm'
-  #  DOCKER_ARCH: i386
-  #  RUNNER_TAG: amd64
-  #  HOSTING_PROVIDER_TAG: tpa
-  #  PHYSICAL_TAG: physical
-  #  IMAGE_EXTENSION: '-slim'
-  #  SPECIAL: [ 'bpo12' ]
-
-  #- OS: ubuntu
-  #  SUITE: [ 'xenial', 'bionic', 'noble', 'oracular' ]
-  #  DOCKER_ARCH: amd64
-  #  RUNNER_TAG: amd64
-  #  HOSTING_PROVIDER_TAG: tpa
-  #  PHYSICAL_TAG: tpa # we don't care about physical
-  #  IMAGE_EXTENSION: [ '' ]
-  #- OS: ubuntu
-  #  SUITE: [ 'xenial', 'bionic' ]
-  #  DOCKER_ARCH: i386
-  #  RUNNER_TAG: amd64
-  #  HOSTING_PROVIDER_TAG: tpa
-  #  PHYSICAL_TAG: physical
-  #  IMAGE_EXTENSION: [ '' ]
-  #  SPECIAL: [ '' ]
+
   - OS: ubuntu
     SUITE: [ 'focal', 'jammy', 'lunar', 'mantic', 'noble', 'oracular' ]
-    DOCKER_ARCH: 'amd64'
-    RUNNER_TAG: amd64
+    DOCKER_ARCH: amd64
     HOSTING_PROVIDER_TAG: tpa
-    PHYSICAL_TAG: tpa # we don't care about physical
-    IMAGE_EXTENSION: [ '' ]
-    SPECIAL: [ '' ]
-  #- OS: ubuntu
-  #  SUITE: [ 'xenial', 'bionic', 'focal', 'jammy', 'lunar', 'mantic', 'noble', 'oracular' ]
-  #  DOCKER_ARCH: 'arm64v8'
-  #  RUNNER_TAG: 'aarch64'
-  #  HOSTING_PROVIDER_TAG: osuosl
-  #  PHYSICAL_TAG: osuosl # we don't care about physical
-  #  IMAGE_EXTENSION: [ '' ]
-  #  SPECIAL: [ '' ]
+  - OS: ubuntu
+    SUITE: [ 'focal', 'jammy', 'lunar', 'mantic', 'noble', 'oracular' ]
+    DOCKER_ARCH: arm64
+    HOSTING_PROVIDER_TAG: osuosl
 
 
 ###########################