Add an .fdo.suffixed_image@foo template

This is the equivalent to the distribution_image for users of the
FDO_REPO_SUFFIX. Given a FDO_REPO_SUFFIX used for the container build stage,
this template provides the required variables to use that image (or the
path to it) in other jobs.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

src/template.tmpl

@@ -399,7 +399,7 @@
 # {{distribution}} template that pulls the {{distribution}} image from the
 # registry based on {% if not version %}FDO_DISTRIBUTION_VERSION and {% endif -%} FDO_DISTRIBUTION_TAG.
 #
-# If you used FDO_REPO_SUFFIX during the container-build stage, this template will not work.
+# If you used FDO_REPO_SUFFIX during the container-build stage, use .fdo.suffixed_image@{{distribution}} instead
 .fdo.distribution_image@{{distribution}}:
   extends: .fdo.{{distribution}}
 {% if version %}
@@ -413,3 +413,11 @@
 {% else %}
     FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/{{distribution}}/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
 {% endif %}
+
+# {{distribution}} template that pulls the {{distribution}} image from the
+# registry based on $FDO_REPO_SUFFIX.
+.fdo.suffixed_image@{{distribution}}:
+  extends: .fdo.{{distribution}}
+  image: $CI_REGISTRY_IMAGE/{{distribution}}/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
+  variables:
+    FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/{{distribution}}/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG

templates/alpine.yml

@@ -193,9 +193,17 @@
 # alpine template that pulls the alpine image from the
 # registry based on FDO_DISTRIBUTION_TAG.
 #
-# If you used FDO_REPO_SUFFIX during the container-build stage, this template will not work.
+# If you used FDO_REPO_SUFFIX during the container-build stage, use .fdo.suffixed_image@alpine instead
 .fdo.distribution_image@alpine:
   extends: .fdo.alpine
   image: $CI_REGISTRY_IMAGE/alpine/latest:$FDO_DISTRIBUTION_TAG
   variables:
     FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/alpine/latest:$FDO_DISTRIBUTION_TAG
+
+# alpine template that pulls the alpine image from the
+# registry based on $FDO_REPO_SUFFIX.
+.fdo.suffixed_image@alpine:
+  extends: .fdo.alpine
+  image: $CI_REGISTRY_IMAGE/alpine/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
+  variables:
+    FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/alpine/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
\ No newline at end of file

templates/arch.yml

@@ -343,9 +343,17 @@
 # arch template that pulls the arch image from the
 # registry based on FDO_DISTRIBUTION_TAG.
 #
-# If you used FDO_REPO_SUFFIX during the container-build stage, this template will not work.
+# If you used FDO_REPO_SUFFIX during the container-build stage, use .fdo.suffixed_image@arch instead
 .fdo.distribution_image@arch:
   extends: .fdo.arch
   image: $CI_REGISTRY_IMAGE/arch/rolling:$FDO_DISTRIBUTION_TAG
   variables:
     FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/arch/rolling:$FDO_DISTRIBUTION_TAG
+
+# arch template that pulls the arch image from the
+# registry based on $FDO_REPO_SUFFIX.
+.fdo.suffixed_image@arch:
+  extends: .fdo.arch
+  image: $CI_REGISTRY_IMAGE/arch/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
+  variables:
+    FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/arch/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
\ No newline at end of file

templates/centos.yml

@@ -179,9 +179,17 @@
 # centos template that pulls the centos image from the
 # registry based on FDO_DISTRIBUTION_VERSION and FDO_DISTRIBUTION_TAG.
 #
-# If you used FDO_REPO_SUFFIX during the container-build stage, this template will not work.
+# If you used FDO_REPO_SUFFIX during the container-build stage, use .fdo.suffixed_image@centos instead
 .fdo.distribution_image@centos:
   extends: .fdo.centos
   image: $CI_REGISTRY_IMAGE/centos/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
   variables:
     FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/centos/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
+
+# centos template that pulls the centos image from the
+# registry based on $FDO_REPO_SUFFIX.
+.fdo.suffixed_image@centos:
+  extends: .fdo.centos
+  image: $CI_REGISTRY_IMAGE/centos/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
+  variables:
+    FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/centos/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
\ No newline at end of file

templates/debian.yml

@@ -364,9 +364,17 @@
 # debian template that pulls the debian image from the
 # registry based on FDO_DISTRIBUTION_VERSION and FDO_DISTRIBUTION_TAG.
 #
-# If you used FDO_REPO_SUFFIX during the container-build stage, this template will not work.
+# If you used FDO_REPO_SUFFIX during the container-build stage, use .fdo.suffixed_image@debian instead
 .fdo.distribution_image@debian:
   extends: .fdo.debian
   image: $CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
   variables:
     FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
+
+# debian template that pulls the debian image from the
+# registry based on $FDO_REPO_SUFFIX.
+.fdo.suffixed_image@debian:
+  extends: .fdo.debian
+  image: $CI_REGISTRY_IMAGE/debian/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
+  variables:
+    FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/debian/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
\ No newline at end of file

templates/fedora.yml

@@ -355,9 +355,17 @@
 # fedora template that pulls the fedora image from the
 # registry based on FDO_DISTRIBUTION_VERSION and FDO_DISTRIBUTION_TAG.
 #
-# If you used FDO_REPO_SUFFIX during the container-build stage, this template will not work.
+# If you used FDO_REPO_SUFFIX during the container-build stage, use .fdo.suffixed_image@fedora instead
 .fdo.distribution_image@fedora:
   extends: .fdo.fedora
   image: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
   variables:
     FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
+
+# fedora template that pulls the fedora image from the
+# registry based on $FDO_REPO_SUFFIX.
+.fdo.suffixed_image@fedora:
+  extends: .fdo.fedora
+  image: $CI_REGISTRY_IMAGE/fedora/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
+  variables:
+    FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
\ No newline at end of file

templates/ubuntu.yml

@@ -408,9 +408,17 @@
 # ubuntu template that pulls the ubuntu image from the
 # registry based on FDO_DISTRIBUTION_VERSION and FDO_DISTRIBUTION_TAG.
 #
-# If you used FDO_REPO_SUFFIX during the container-build stage, this template will not work.
+# If you used FDO_REPO_SUFFIX during the container-build stage, use .fdo.suffixed_image@ubuntu instead
 .fdo.distribution_image@ubuntu:
   extends: .fdo.ubuntu
   image: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
   variables:
     FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
+
+# ubuntu template that pulls the ubuntu image from the
+# registry based on $FDO_REPO_SUFFIX.
+.fdo.suffixed_image@ubuntu:
+  extends: .fdo.ubuntu
+  image: $CI_REGISTRY_IMAGE/ubuntu/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
+  variables:
+    FDO_DISTRIBUTION_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
\ No newline at end of file