Commit 324c7871 authored by Peter Hutterer's avatar Peter Hutterer Committed by Benjamin Tissoires
Browse files

Rename distribution-image and suffixed-image for consistency



We use dashes in container-build so let's stay true to that.

This is an API break but not too many are using those yet anyway.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 51ecd2b1
......@@ -228,14 +228,14 @@ on and re-use that template to fill in the variables for us where required.
# The test job for your project. Extending from the CI Templates
# .fdo.distribution_image makes it use the same image we built above.
# .fdo.distribution-image makes it use the same image we built above.
mytest:
extends:
- .fdo.distribution_image@fedora
- .fdo.distribution-image@fedora
- .myproject.fedora:30
stage: test
script:
# FDO_DISTRIBUTION_NAME is set by the distribution_image job.
# FDO_DISTRIBUTION_NAME is set by the distribution-image job.
# It should be considered read-only
- echo "Hello world in $FDO_DISTRIBUTION_NAME"
......
......@@ -91,7 +91,7 @@
{% else %}
# ``$CI_REGISTRY_IMAGE/{{distribution}}/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
{% endif %}
# The ``.fdo.distribution_image@{{distribution}}`` template provides access to this image.
# The ``.fdo.distribution-image@{{distribution}}`` template provides access to this image.
#
.fdo.container-build@{{distribution}}:
extends: .fdo.{{distribution}}
......@@ -455,7 +455,7 @@
{% else %}
# ``$CI_REGISTRY_IMAGE/{{distribution}}/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
{% endif %}
# The ``.fdo.distribution_image@{{distribution}}`` template provides access to this image.
# The ``.fdo.distribution-image@{{distribution}}`` template provides access to this image.
#
.fdo.container-ifnot-exists@{{distribution}}:
extends: .fdo.container-build@{{distribution}}
......@@ -515,7 +515,7 @@
#
# .. note:: If you used ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.suffixed_image@{{distribution}}`` instead.
.fdo.distribution_image@{{distribution}}:
.fdo.distribution-image@{{distribution}}:
extends: .fdo.{{distribution}}
{% if version %}
image: $CI_REGISTRY_IMAGE/{{distribution}}/{{version}}:$FDO_DISTRIBUTION_TAG
......@@ -551,7 +551,7 @@
# Variables provided by this template should be considered read-only.
#
# .. note:: If you did not use ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.distribution_image@{{distribution}}`` instead.
# ``.fdo.distribution-image@{{distribution}}`` instead.
.fdo.suffixed_image@{{distribution}}:
extends: .fdo.{{distribution}}
image: $CI_REGISTRY_IMAGE/{{distribution}}/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
......
......@@ -77,7 +77,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/alpine/latest:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@alpine`` template provides access to this image.
# The ``.fdo.distribution-image@alpine`` template provides access to this image.
#
.fdo.container-build@alpine:
extends: .fdo.alpine
......@@ -239,7 +239,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/alpine/latest:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@alpine`` template provides access to this image.
# The ``.fdo.distribution-image@alpine`` template provides access to this image.
#
.fdo.container-ifnot-exists@alpine:
extends: .fdo.container-build@alpine
......@@ -280,7 +280,7 @@
#
# .. note:: If you used ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.suffixed_image@alpine`` instead.
.fdo.distribution_image@alpine:
.fdo.distribution-image@alpine:
extends: .fdo.alpine
image: $CI_REGISTRY_IMAGE/alpine/latest:$FDO_DISTRIBUTION_TAG
variables:
......@@ -308,7 +308,7 @@
# Variables provided by this template should be considered read-only.
#
# .. note:: If you did not use ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.distribution_image@alpine`` instead.
# ``.fdo.distribution-image@alpine`` instead.
.fdo.suffixed_image@alpine:
extends: .fdo.alpine
image: $CI_REGISTRY_IMAGE/alpine/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
......
......@@ -77,7 +77,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/arch/rolling:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@arch`` template provides access to this image.
# The ``.fdo.distribution-image@arch`` template provides access to this image.
#
.fdo.container-build@arch:
extends: .fdo.arch
......@@ -390,7 +390,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/arch/rolling:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@arch`` template provides access to this image.
# The ``.fdo.distribution-image@arch`` template provides access to this image.
#
.fdo.container-ifnot-exists@arch:
extends: .fdo.container-build@arch
......@@ -428,7 +428,7 @@
#
# .. note:: If you used ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.suffixed_image@arch`` instead.
.fdo.distribution_image@arch:
.fdo.distribution-image@arch:
extends: .fdo.arch
image: $CI_REGISTRY_IMAGE/arch/rolling:$FDO_DISTRIBUTION_TAG
variables:
......@@ -456,7 +456,7 @@
# Variables provided by this template should be considered read-only.
#
# .. note:: If you did not use ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.distribution_image@arch`` instead.
# ``.fdo.distribution-image@arch`` instead.
.fdo.suffixed_image@arch:
extends: .fdo.arch
image: $CI_REGISTRY_IMAGE/arch/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
......
......@@ -78,7 +78,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/centos/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@centos`` template provides access to this image.
# The ``.fdo.distribution-image@centos`` template provides access to this image.
#
.fdo.container-build@centos:
extends: .fdo.centos
......@@ -227,7 +227,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/centos/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@centos`` template provides access to this image.
# The ``.fdo.distribution-image@centos`` template provides access to this image.
#
.fdo.container-ifnot-exists@centos:
extends: .fdo.container-build@centos
......@@ -255,7 +255,7 @@
#
# .. note:: If you used ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.suffixed_image@centos`` instead.
.fdo.distribution_image@centos:
.fdo.distribution-image@centos:
extends: .fdo.centos
image: $CI_REGISTRY_IMAGE/centos/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
variables:
......@@ -283,7 +283,7 @@
# Variables provided by this template should be considered read-only.
#
# .. note:: If you did not use ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.distribution_image@centos`` instead.
# ``.fdo.distribution-image@centos`` instead.
.fdo.suffixed_image@centos:
extends: .fdo.centos
image: $CI_REGISTRY_IMAGE/centos/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
......
......@@ -78,7 +78,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@debian`` template provides access to this image.
# The ``.fdo.distribution-image@debian`` template provides access to this image.
#
.fdo.container-build@debian:
extends: .fdo.debian
......@@ -413,7 +413,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@debian`` template provides access to this image.
# The ``.fdo.distribution-image@debian`` template provides access to this image.
#
.fdo.container-ifnot-exists@debian:
extends: .fdo.container-build@debian
......@@ -466,7 +466,7 @@
#
# .. note:: If you used ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.suffixed_image@debian`` instead.
.fdo.distribution_image@debian:
.fdo.distribution-image@debian:
extends: .fdo.debian
image: $CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
variables:
......@@ -494,7 +494,7 @@
# Variables provided by this template should be considered read-only.
#
# .. note:: If you did not use ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.distribution_image@debian`` instead.
# ``.fdo.distribution-image@debian`` instead.
.fdo.suffixed_image@debian:
extends: .fdo.debian
image: $CI_REGISTRY_IMAGE/debian/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
......
......@@ -78,7 +78,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@fedora`` template provides access to this image.
# The ``.fdo.distribution-image@fedora`` template provides access to this image.
#
.fdo.container-build@fedora:
extends: .fdo.fedora
......@@ -404,7 +404,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@fedora`` template provides access to this image.
# The ``.fdo.distribution-image@fedora`` template provides access to this image.
#
.fdo.container-ifnot-exists@fedora:
extends: .fdo.container-build@fedora
......@@ -457,7 +457,7 @@
#
# .. note:: If you used ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.suffixed_image@fedora`` instead.
.fdo.distribution_image@fedora:
.fdo.distribution-image@fedora:
extends: .fdo.fedora
image: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
variables:
......@@ -485,7 +485,7 @@
# Variables provided by this template should be considered read-only.
#
# .. note:: If you did not use ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.distribution_image@fedora`` instead.
# ``.fdo.distribution-image@fedora`` instead.
.fdo.suffixed_image@fedora:
extends: .fdo.fedora
image: $CI_REGISTRY_IMAGE/fedora/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
......
......@@ -78,7 +78,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@ubuntu`` template provides access to this image.
# The ``.fdo.distribution-image@ubuntu`` template provides access to this image.
#
.fdo.container-build@ubuntu:
extends: .fdo.ubuntu
......@@ -457,7 +457,7 @@
#
# If the repository suffix was **not** specified, the image path is
# ``$CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG``.
# The ``.fdo.distribution_image@ubuntu`` template provides access to this image.
# The ``.fdo.distribution-image@ubuntu`` template provides access to this image.
#
.fdo.container-ifnot-exists@ubuntu:
extends: .fdo.container-build@ubuntu
......@@ -510,7 +510,7 @@
#
# .. note:: If you used ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.suffixed_image@ubuntu`` instead.
.fdo.distribution_image@ubuntu:
.fdo.distribution-image@ubuntu:
extends: .fdo.ubuntu
image: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
variables:
......@@ -538,7 +538,7 @@
# Variables provided by this template should be considered read-only.
#
# .. note:: If you did not use ``FDO_REPO_SUFFIX`` when building the container, use
# ``.fdo.distribution_image@ubuntu`` instead.
# ``.fdo.distribution-image@ubuntu`` instead.
.fdo.suffixed_image@ubuntu:
extends: .fdo.ubuntu
image: $CI_REGISTRY_IMAGE/ubuntu/$FDO_REPO_SUFFIX:$FDO_DISTRIBUTION_TAG
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment