Commit 13ea575e authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

bootstrap: provide an internal multi-arch manifest



This allows to simplify which image needs to be pulled.
Signed-off-by: Benjamin Tissoires's avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
parent 856dc00a
...@@ -214,7 +214,7 @@ pages: ...@@ -214,7 +214,7 @@ pages:
# #
.publish.template: .publish.template:
stage: publish stage: publish
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
script: script:
- skopeo login --username "$QUAY_USER" --password "$(cat $QUAY_TOKEN)" quay.io - skopeo login --username "$QUAY_USER" --password "$(cat $QUAY_TOKEN)" quay.io
- set -x - set -x
...@@ -266,7 +266,7 @@ publish to quay.io: ...@@ -266,7 +266,7 @@ publish to quay.io:
- x86_64 - x86_64
- aarch64 - aarch64
FDO_DISTRIBUTION_TAG: FDO_DISTRIBUTION_TAG:
- '2020-12-18.2' - '2021-03-01.0'
- FDO_DISTRIBUTION_IMAGE: - FDO_DISTRIBUTION_IMAGE:
- qemu - qemu
- qemu-mkosi - qemu-mkosi
...@@ -302,11 +302,11 @@ publish ci-fairy to quay.io: ...@@ -302,11 +302,11 @@ publish ci-fairy to quay.io:
# exist # exist
# #
test published images: test published images:
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
stage: test published images stage: test published images
script: script:
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-18.2 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2021-03-01.0
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-18.2 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2021-03-01.0
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-41ee4d1ca15ea24c7d171a573fab18538561e526253b742b8172dd7a6412035f - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-41ee4d1ca15ea24c7d171a573fab18538561e526253b742b8172dd7a6412035f
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2021-02-15.0 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2021-02-15.0
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2021-02-15.0 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2021-02-15.0
......
...@@ -21,6 +21,7 @@ stages: ...@@ -21,6 +21,7 @@ stages:
# Common variable definitions # Common variable definitions
# #
.ci-commons-alpine: .ci-commons-alpine:
image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
variables: variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl' FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh' FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
...@@ -41,17 +42,17 @@ stages: ...@@ -41,17 +42,17 @@ stages:
# #
.alpine:ci@container-build@x86_64: .alpine:ci@container-build@x86_64:
extends: extends:
- .fdo.container-build@alpine@x86_64 - .fdo.container-build@alpine
- .ci-commons-alpine@x86_64 - .ci-commons-alpine@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2
stage: alpine_container_build stage: alpine_container_build
.alpine:ci@container-build@aarch64: .alpine:ci@container-build@aarch64:
extends: extends:
- .fdo.container-build@alpine@aarch64 - .fdo.container-build@alpine
- .ci-commons-alpine@aarch64 - .ci-commons-alpine@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-18.2 tags:
- aarch64
stage: alpine_container_build stage: alpine_container_build
...@@ -60,8 +61,8 @@ stages: ...@@ -60,8 +61,8 @@ stages:
# #
.alpine@check@x86_64: .alpine@check@x86_64:
extends: extends:
- .fdo.distribution-image@alpine
- .ci-commons-alpine@x86_64 - .ci-commons-alpine@x86_64
- .fdo.distribution-image@alpine
stage: alpine_check stage: alpine_check
script: script:
# run both curl and wget because one of those two is installed and one is # run both curl and wget because one of those two is installed and one is
...@@ -194,7 +195,7 @@ do not rebuild alpine:latest@container-build@x86_64: ...@@ -194,7 +195,7 @@ do not rebuild alpine:latest@container-build@x86_64:
check labels alpine@x86_64:latest: check labels alpine@x86_64:latest:
extends: extends:
- alpine:latest@check@x86_64 - alpine:latest@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
script: script:
# FDO_DISTRIBUTION_IMAGE still has indirections # FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE}) - DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
...@@ -21,6 +21,7 @@ stages: ...@@ -21,6 +21,7 @@ stages:
# Common variable definitions # Common variable definitions
# #
.ci-commons-arch: .ci-commons-arch:
image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
variables: variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl' FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh' FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
...@@ -41,9 +42,8 @@ stages: ...@@ -41,9 +42,8 @@ stages:
# #
.arch:ci@container-build@x86_64: .arch:ci@container-build@x86_64:
extends: extends:
- .fdo.container-build@arch@x86_64 - .fdo.container-build@arch
- .ci-commons-arch@x86_64 - .ci-commons-arch@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2
stage: arch_container_build stage: arch_container_build
...@@ -52,8 +52,8 @@ stages: ...@@ -52,8 +52,8 @@ stages:
# #
.arch@check@x86_64: .arch@check@x86_64:
extends: extends:
- .fdo.distribution-image@arch
- .ci-commons-arch@x86_64 - .ci-commons-arch@x86_64
- .fdo.distribution-image@arch
stage: arch_check stage: arch_check
script: script:
# run both curl and wget because one of those two is installed and one is # run both curl and wget because one of those two is installed and one is
...@@ -170,7 +170,7 @@ do not rebuild arch:rolling@container-build@x86_64: ...@@ -170,7 +170,7 @@ do not rebuild arch:rolling@container-build@x86_64:
check labels arch@x86_64:rolling: check labels arch@x86_64:rolling:
extends: extends:
- arch:rolling@check@x86_64 - arch:rolling@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
script: script:
# FDO_DISTRIBUTION_IMAGE still has indirections # FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE}) - DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
...@@ -5,6 +5,7 @@ include: ...@@ -5,6 +5,7 @@ include:
stages: stages:
- bootstrapping - bootstrapping
- bootstrapping manifest
- bootstrapping_qemu - bootstrapping_qemu
################################################################# #################################################################
...@@ -14,13 +15,13 @@ stages: ...@@ -14,13 +15,13 @@ stages:
################################################################# #################################################################
.bootstrap_skeleton@x86_64: .bootstrap_skeleton:
extends: .fdo.container-build@fedora@x86_64 extends: .fdo.container-build@fedora
stage: bootstrapping stage: bootstrapping
variables: variables:
FDO_UPSTREAM_REPO: freedesktop/ci-templates FDO_UPSTREAM_REPO: freedesktop/ci-templates
FDO_DISTRIBUTION_VERSION: '33' FDO_DISTRIBUTION_VERSION: '33'
FDO_DISTRIBUTION_TAG: '2020-12-18.2' FDO_DISTRIBUTION_TAG: '2021-03-01.0'
# Builds an image that the .fdo.container-build@ templates run on # Builds an image that the .fdo.container-build@ templates run on
...@@ -31,7 +32,7 @@ stages: ...@@ -31,7 +32,7 @@ stages:
# a commit in runc prevented it to be compiled against musl. So we just # a commit in runc prevented it to be compiled against musl. So we just
# end up building a regular container image. # end up building a regular container image.
bootstrap@x86_64: bootstrap@x86_64:
extends: .bootstrap_skeleton@x86_64 extends: .bootstrap_skeleton
image: fedora:33 image: fedora:33
before_script: before_script:
- bash bootstrap/bootstrap_fedora.sh - bash bootstrap/bootstrap_fedora.sh
...@@ -49,6 +50,39 @@ bootstrap@aarch64: ...@@ -49,6 +50,39 @@ bootstrap@aarch64:
variables: variables:
FDO_REPO_SUFFIX: aarch64/buildah FDO_REPO_SUFFIX: aarch64/buildah
bootstrap@local-manifest:
extends:
- .bootstrap_skeleton
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2021-03-01.0
stage: bootstrapping manifest
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# create the multi-arch manifest
- buildah manifest create buildah:2021-03-01.0
$CI_REGISTRY_IMAGE/x86_64/buildah:2021-03-01.0
$CI_REGISTRY_IMAGE/aarch64/buildah:2021-03-01.0
# check if we already have this manifest in the registry
- buildah manifest inspect buildah:2021-03-01.0 > new_manifest.json
- buildah manifest inspect docker://$CI_REGISTRY_IMAGE/buildah:2021-03-01.0 > current_manifest.json || true
- diff -u current_manifest.json new_manifest.json || touch .need_push
# and push it
- |
if [[ -e .need_push ]]
then
rm .need_push
buildah manifest push --format v2s2 --all \
buildah:2021-03-01.0 \
docker://$CI_REGISTRY_IMAGE/buildah:2021-03-01.0
fi
needs:
- bootstrap@aarch64
- bootstrap@x86_64
# qemu container base image. This is the base image for running qemu jobs, # qemu container base image. This is the base image for running qemu jobs,
# i.e. when you are building an image with .fdo.qemu-prep@, that image is a gcow # i.e. when you are building an image with .fdo.qemu-prep@, that image is a gcow
...@@ -59,13 +93,13 @@ bootstrap@aarch64: ...@@ -59,13 +93,13 @@ bootstrap@aarch64:
# - genisoimage (to create a cloud-init iso that will help us filling in the custom parameters) # - genisoimage (to create a cloud-init iso that will help us filling in the custom parameters)
# - usbutils (for being able to call lsusb and redirect part a USB device) # - usbutils (for being able to call lsusb and redirect part a USB device)
bootstrap-qemu@x86_64: bootstrap-qemu@x86_64:
extends: .bootstrap_skeleton@x86_64 extends: .bootstrap_skeleton
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2021-03-01.0
stage: bootstrapping_qemu stage: bootstrapping_qemu
dependencies: [] dependencies: []
variables: variables:
FDO_DISTRIBUTION_TAG: '2021-02-15.0' FDO_DISTRIBUTION_TAG: '2021-02-15.0'
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/buildah:2021-03-01.0
FDO_REPO_SUFFIX: x86_64/qemu-base FDO_REPO_SUFFIX: x86_64/qemu-base
FDO_DISTRIBUTION_PACKAGES: 'qemu genisoimage usbutils' FDO_DISTRIBUTION_PACKAGES: 'qemu genisoimage usbutils'
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl' FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl'
......
...@@ -21,6 +21,7 @@ stages: ...@@ -21,6 +21,7 @@ stages:
# Common variable definitions # Common variable definitions
# #
.ci-commons-centos: .ci-commons-centos:
image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
variables: variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl' FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh' FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
...@@ -42,9 +43,8 @@ stages: ...@@ -42,9 +43,8 @@ stages:
# #
.centos:ci@container-build@x86_64: .centos:ci@container-build@x86_64:
extends: extends:
- .fdo.container-build@centos@x86_64 - .fdo.container-build@centos
- .ci-commons-centos@x86_64 - .ci-commons-centos@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2
stage: centos_container_build stage: centos_container_build
...@@ -53,8 +53,8 @@ stages: ...@@ -53,8 +53,8 @@ stages:
# #
.centos@check@x86_64: .centos@check@x86_64:
extends: extends:
- .fdo.distribution-image@centos
- .ci-commons-centos@x86_64 - .ci-commons-centos@x86_64
- .fdo.distribution-image@centos
stage: centos_check stage: centos_check
script: script:
# run both curl and wget because one of those two is installed and one is # run both curl and wget because one of those two is installed and one is
...@@ -171,7 +171,7 @@ do not rebuild centos:7@container-build@x86_64: ...@@ -171,7 +171,7 @@ do not rebuild centos:7@container-build@x86_64:
check labels centos@x86_64:7: check labels centos@x86_64:7:
extends: extends:
- centos:7@check@x86_64 - centos:7@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
script: script:
# FDO_DISTRIBUTION_IMAGE still has indirections # FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE}) - DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
...@@ -6,7 +6,7 @@ stages: ...@@ -6,7 +6,7 @@ stages:
- image build - image build
.local buildah image: .local buildah image:
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
# The ci-fairy base image. We build a base image that we can bump independently # The ci-fairy base image. We build a base image that we can bump independently
# via the tag, ci-fairy itself gets layered on top with each commit. # via the tag, ci-fairy itself gets layered on top with each commit.
......
...@@ -21,6 +21,7 @@ stages: ...@@ -21,6 +21,7 @@ stages:
# Common variable definitions # Common variable definitions
# #
.ci-commons-debian: .ci-commons-debian:
image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
variables: variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl' FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh' FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
...@@ -42,17 +43,17 @@ stages: ...@@ -42,17 +43,17 @@ stages:
# #
.debian:ci@container-build@x86_64: .debian:ci@container-build@x86_64:
extends: extends:
- .fdo.container-build@debian@x86_64 - .fdo.container-build@debian
- .ci-commons-debian@x86_64 - .ci-commons-debian@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2
stage: debian_container_build stage: debian_container_build
.debian:ci@container-build@aarch64: .debian:ci@container-build@aarch64:
extends: extends:
- .fdo.container-build@debian@aarch64 - .fdo.container-build@debian
- .ci-commons-debian@aarch64 - .ci-commons-debian@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-18.2 tags:
- aarch64
stage: debian_container_build stage: debian_container_build
...@@ -77,8 +78,8 @@ stages: ...@@ -77,8 +78,8 @@ stages:
# #
.debian@check@x86_64: .debian@check@x86_64:
extends: extends:
- .fdo.distribution-image@debian
- .ci-commons-debian@x86_64 - .ci-commons-debian@x86_64
- .fdo.distribution-image@debian
stage: debian_check stage: debian_check
script: script:
# run both curl and wget because one of those two is installed and one is # run both curl and wget because one of those two is installed and one is
...@@ -97,8 +98,8 @@ stages: ...@@ -97,8 +98,8 @@ stages:
.debian@qemu-check@x86_64: .debian@qemu-check@x86_64:
stage: debian_check stage: debian_check
extends: extends:
- .fdo.distribution-image@debian
- .ci-commons-debian@x86_64 - .ci-commons-debian@x86_64
- .fdo.distribution-image@debian
tags: tags:
- kvm - kvm
script: script:
...@@ -260,7 +261,7 @@ do not rebuild debian:buster@container-build@x86_64: ...@@ -260,7 +261,7 @@ do not rebuild debian:buster@container-build@x86_64:
check labels debian@x86_64:buster: check labels debian@x86_64:buster:
extends: extends:
- debian:buster@check@x86_64 - debian:buster@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
script: script:
# FDO_DISTRIBUTION_IMAGE still has indirections # FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE}) - DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
...@@ -21,6 +21,7 @@ stages: ...@@ -21,6 +21,7 @@ stages:
# Common variable definitions # Common variable definitions
# #
.ci-commons-fedora: .ci-commons-fedora:
image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
variables: variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl' FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh' FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
...@@ -42,17 +43,17 @@ stages: ...@@ -42,17 +43,17 @@ stages:
# #
.fedora:ci@container-build@x86_64: .fedora:ci@container-build@x86_64:
extends: extends:
- .fdo.container-build@fedora@x86_64 - .fdo.container-build@fedora
- .ci-commons-fedora@x86_64 - .ci-commons-fedora@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2
stage: fedora_container_build stage: fedora_container_build
.fedora:ci@container-build@aarch64: .fedora:ci@container-build@aarch64:
extends: extends:
- .fdo.container-build@fedora@aarch64 - .fdo.container-build@fedora
- .ci-commons-fedora@aarch64 - .ci-commons-fedora@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-18.2 tags:
- aarch64
stage: fedora_container_build stage: fedora_container_build
...@@ -77,8 +78,8 @@ stages: ...@@ -77,8 +78,8 @@ stages:
# #
.fedora@check@x86_64: .fedora@check@x86_64:
extends: extends:
- .fdo.distribution-image@fedora
- .ci-commons-fedora@x86_64 - .ci-commons-fedora@x86_64
- .fdo.distribution-image@fedora
stage: fedora_check stage: fedora_check
script: script:
# run both curl and wget because one of those two is installed and one is # run both curl and wget because one of those two is installed and one is
...@@ -97,8 +98,8 @@ stages: ...@@ -97,8 +98,8 @@ stages:
.fedora@qemu-check@x86_64: .fedora@qemu-check@x86_64:
stage: fedora_check stage: fedora_check
extends: extends:
- .fdo.distribution-image@fedora
- .ci-commons-fedora@x86_64 - .ci-commons-fedora@x86_64
- .fdo.distribution-image@fedora
tags: tags:
- kvm - kvm
script: script:
...@@ -260,7 +261,7 @@ do not rebuild fedora:33@container-build@x86_64: ...@@ -260,7 +261,7 @@ do not rebuild fedora:33@container-build@x86_64:
check labels fedora@x86_64:33: check labels fedora@x86_64:33:
extends: extends:
- fedora:33@check@x86_64 - fedora:33@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
script: script:
# FDO_DISTRIBUTION_IMAGE still has indirections # FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE}) - DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
...@@ -21,6 +21,7 @@ stages: ...@@ -21,6 +21,7 @@ stages:
# Common variable definitions # Common variable definitions
# #
.ci-commons-ubuntu: .ci-commons-ubuntu:
image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
variables: variables:
FDO_DISTRIBUTION_PACKAGES: 'wget curl' FDO_DISTRIBUTION_PACKAGES: 'wget curl'
FDO_DISTRIBUTION_EXEC: 'sh test/script.sh' FDO_DISTRIBUTION_EXEC: 'sh test/script.sh'
...@@ -42,17 +43,17 @@ stages: ...@@ -42,17 +43,17 @@ stages:
# #
.ubuntu:ci@container-build@x86_64: .ubuntu:ci@container-build@x86_64:
extends: extends:
- .fdo.container-build@ubuntu@x86_64 - .fdo.container-build@ubuntu
- .ci-commons-ubuntu@x86_64 - .ci-commons-ubuntu@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2
stage: ubuntu_container_build stage: ubuntu_container_build
.ubuntu:ci@container-build@aarch64: .ubuntu:ci@container-build@aarch64:
extends: extends:
- .fdo.container-build@ubuntu@aarch64 - .fdo.container-build@ubuntu
- .ci-commons-ubuntu@aarch64 - .ci-commons-ubuntu@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-18.2 tags:
- aarch64
stage: ubuntu_container_build stage: ubuntu_container_build
...@@ -77,8 +78,8 @@ stages: ...@@ -77,8 +78,8 @@ stages:
# #
.ubuntu@check@x86_64: .ubuntu@check@x86_64:
extends: extends:
- .fdo.distribution-image@ubuntu
- .ci-commons-ubuntu@x86_64 - .ci-commons-ubuntu@x86_64
- .fdo.distribution-image@ubuntu
stage: ubuntu_check stage: ubuntu_check
script: script:
# run both curl and wget because one of those two is installed and one is # run both curl and wget because one of those two is installed and one is
...@@ -97,8 +98,8 @@ stages: ...@@ -97,8 +98,8 @@ stages:
.ubuntu@qemu-check@x86_64: .ubuntu@qemu-check@x86_64:
stage: ubuntu_check stage: ubuntu_check
extends: extends:
- .fdo.distribution-image@ubuntu
- .ci-commons-ubuntu@x86_64 - .ci-commons-ubuntu@x86_64
- .fdo.distribution-image@ubuntu
tags: tags:
- kvm - kvm
script: script:
...@@ -260,7 +261,7 @@ do not rebuild ubuntu:20.10@container-build@x86_64: ...@@ -260,7 +261,7 @@ do not rebuild ubuntu:20.10@container-build@x86_64:
check labels ubuntu@x86_64:20.10: check labels ubuntu@x86_64:20.10:
extends: extends:
- ubuntu:20.10@check@x86_64 - ubuntu:20.10@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2 image: $CI_REGISTRY_IMAGE/buildah:2021-03-01.0
script: script:
# FDO_DISTRIBUTION_IMAGE still has indirections # FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE}) - DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
...@@ -5,6 +5,7 @@ include: ...@@ -5,6 +5,7 @@ include: