Commit ef930450 authored by Peter Hutterer's avatar Peter Hutterer
Browse files

vmctl: work around a race condition in the initial ssh connection



Sometimes, but rather unpredictably, we get disconnected while waiting for the
initial ssh connection. If that happens, try again.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 3c8d88e5
...@@ -202,7 +202,7 @@ pages: ...@@ -202,7 +202,7 @@ pages:
# #
.publish.template: .publish.template:
stage: publish stage: publish
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
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
...@@ -251,7 +251,7 @@ publish to quay.io: ...@@ -251,7 +251,7 @@ publish to quay.io:
- x86_64 - x86_64
- aarch64 - aarch64
FDO_DISTRIBUTION_TAG: FDO_DISTRIBUTION_TAG:
- '2020-12-16.3' - '2020-12-16.4'
- FDO_DISTRIBUTION_IMAGE: - FDO_DISTRIBUTION_IMAGE:
- qemu - qemu
- qemu-mkosi - qemu-mkosi
...@@ -260,7 +260,7 @@ publish to quay.io: ...@@ -260,7 +260,7 @@ publish to quay.io:
FDO_ARCHITECTURE: FDO_ARCHITECTURE:
- x86_64 - x86_64
FDO_DISTRIBUTION_TAG: FDO_DISTRIBUTION_TAG:
- '2020-12-16.3' - '2020-12-16.4'
variables: variables:
# local format, e.g. x86_64/mkosi-base-12324 # local format, e.g. x86_64/mkosi-base-12324
# distant format, e.g. mkosi-base-x86_64-12324 # distant format, e.g. mkosi-base-x86_64-12324
...@@ -287,13 +287,13 @@ publish ci-fairy to quay.io: ...@@ -287,13 +287,13 @@ publish ci-fairy to quay.io:
# exist # exist
# #
test published images: test published images:
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
stage: test published images stage: test published images
script: script:
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.4
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.4
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-936060119966b261c07af69d9422ee970cb2f37a355ba8509dceeaee70633349 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-936060119966b261c07af69d9422ee970cb2f37a355ba8509dceeaee70633349
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.3 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.4
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.3 - skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.4
rules: rules:
- if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "freedesktop/ci-templates"' - if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "freedesktop/ci-templates"'
\ No newline at end of file
...@@ -43,7 +43,7 @@ stages: ...@@ -43,7 +43,7 @@ stages:
extends: extends:
- .fdo.container-build@alpine@x86_64 - .fdo.container-build@alpine@x86_64
- .ci-commons-alpine@x86_64 - .ci-commons-alpine@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
stage: alpine_container_build stage: alpine_container_build
...@@ -51,7 +51,7 @@ stages: ...@@ -51,7 +51,7 @@ stages:
extends: extends:
- .fdo.container-build@alpine@aarch64 - .fdo.container-build@alpine@aarch64
- .ci-commons-alpine@aarch64 - .ci-commons-alpine@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.4
stage: alpine_container_build stage: alpine_container_build
...@@ -194,7 +194,7 @@ do not rebuild alpine:latest@container-build@x86_64: ...@@ -194,7 +194,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-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
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})
......
...@@ -43,7 +43,7 @@ stages: ...@@ -43,7 +43,7 @@ stages:
extends: extends:
- .fdo.container-build@arch@x86_64 - .fdo.container-build@arch@x86_64
- .ci-commons-arch@x86_64 - .ci-commons-arch@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
stage: arch_container_build stage: arch_container_build
...@@ -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-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
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})
......
...@@ -20,7 +20,7 @@ stages: ...@@ -20,7 +20,7 @@ stages:
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-16.3' FDO_DISTRIBUTION_TAG: '2020-12-16.4'
# we need a minimalist image capable of buildah, podman, skopeo, curl, # we need a minimalist image capable of buildah, podman, skopeo, curl,
...@@ -54,12 +54,12 @@ stages: ...@@ -54,12 +54,12 @@ stages:
# - 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)
.qemu@x86_64: .qemu@x86_64:
extends: .bootstrap_skeleton@x86_64 extends: .bootstrap_skeleton@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
stage: bootstrapping_qemu stage: bootstrapping_qemu
dependencies: [] dependencies: []
variables: variables:
FDO_DISTRIBUTION_TAG: '2020-12-16.3' FDO_DISTRIBUTION_TAG: '2020-12-16.4'
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
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'
......
...@@ -44,7 +44,7 @@ stages: ...@@ -44,7 +44,7 @@ stages:
extends: extends:
- .fdo.container-build@centos@x86_64 - .fdo.container-build@centos@x86_64
- .ci-commons-centos@x86_64 - .ci-commons-centos@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
stage: centos_container_build stage: centos_container_build
...@@ -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-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
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})
......
...@@ -44,7 +44,7 @@ stages: ...@@ -44,7 +44,7 @@ stages:
extends: extends:
- .fdo.container-build@debian@x86_64 - .fdo.container-build@debian@x86_64
- .ci-commons-debian@x86_64 - .ci-commons-debian@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
stage: debian_container_build stage: debian_container_build
...@@ -52,7 +52,7 @@ stages: ...@@ -52,7 +52,7 @@ stages:
extends: extends:
- .fdo.container-build@debian@aarch64 - .fdo.container-build@debian@aarch64
- .ci-commons-debian@aarch64 - .ci-commons-debian@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.4
stage: debian_container_build stage: debian_container_build
...@@ -63,7 +63,7 @@ stages: ...@@ -63,7 +63,7 @@ stages:
extends: extends:
- .fdo.qemu-build@debian@x86_64 - .fdo.qemu-build@debian@x86_64
- .ci-commons-debian@x86_64 - .ci-commons-debian@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.4
stage: debian_container_build stage: debian_container_build
artifacts: artifacts:
name: logs-$CI_PIPELINE_ID name: logs-$CI_PIPELINE_ID
...@@ -230,7 +230,7 @@ debian:stretch@qemu-build@x86_64: ...@@ -230,7 +230,7 @@ debian:stretch@qemu-build@x86_64:
variables: variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl' FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.3 QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.4
debian:stretch@qemu-check@x86_64: debian:stretch@qemu-check@x86_64:
...@@ -260,7 +260,7 @@ do not rebuild debian:stretch@container-build@x86_64: ...@@ -260,7 +260,7 @@ do not rebuild debian:stretch@container-build@x86_64:
check labels debian@x86_64:stretch: check labels debian@x86_64:stretch:
extends: extends:
- debian:stretch@check@x86_64 - debian:stretch@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
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})
......
...@@ -44,7 +44,7 @@ stages: ...@@ -44,7 +44,7 @@ stages:
extends: extends:
- .fdo.container-build@fedora@x86_64 - .fdo.container-build@fedora@x86_64
- .ci-commons-fedora@x86_64 - .ci-commons-fedora@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
stage: fedora_container_build stage: fedora_container_build
...@@ -52,7 +52,7 @@ stages: ...@@ -52,7 +52,7 @@ stages:
extends: extends:
- .fdo.container-build@fedora@aarch64 - .fdo.container-build@fedora@aarch64
- .ci-commons-fedora@aarch64 - .ci-commons-fedora@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.4
stage: fedora_container_build stage: fedora_container_build
...@@ -63,7 +63,7 @@ stages: ...@@ -63,7 +63,7 @@ stages:
extends: extends:
- .fdo.qemu-build@fedora@x86_64 - .fdo.qemu-build@fedora@x86_64
- .ci-commons-fedora@x86_64 - .ci-commons-fedora@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.4
stage: fedora_container_build stage: fedora_container_build
artifacts: artifacts:
name: logs-$CI_PIPELINE_ID name: logs-$CI_PIPELINE_ID
...@@ -230,7 +230,7 @@ fedora:32@qemu-build@x86_64: ...@@ -230,7 +230,7 @@ fedora:32@qemu-build@x86_64:
variables: variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl' FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.3 QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.4
fedora:32@qemu-check@x86_64: fedora:32@qemu-check@x86_64:
...@@ -260,7 +260,7 @@ do not rebuild fedora:32@container-build@x86_64: ...@@ -260,7 +260,7 @@ do not rebuild fedora:32@container-build@x86_64:
check labels fedora@x86_64:32: check labels fedora@x86_64:32:
extends: extends:
- fedora:32@check@x86_64 - fedora:32@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
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})
......
...@@ -44,7 +44,7 @@ stages: ...@@ -44,7 +44,7 @@ stages:
extends: extends:
- .fdo.container-build@ubuntu@x86_64 - .fdo.container-build@ubuntu@x86_64
- .ci-commons-ubuntu@x86_64 - .ci-commons-ubuntu@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
stage: ubuntu_container_build stage: ubuntu_container_build
...@@ -52,7 +52,7 @@ stages: ...@@ -52,7 +52,7 @@ stages:
extends: extends:
- .fdo.container-build@ubuntu@aarch64 - .fdo.container-build@ubuntu@aarch64
- .ci-commons-ubuntu@aarch64 - .ci-commons-ubuntu@aarch64
image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/aarch64/buildah:2020-12-16.4
stage: ubuntu_container_build stage: ubuntu_container_build
...@@ -63,7 +63,7 @@ stages: ...@@ -63,7 +63,7 @@ stages:
extends: extends:
- .fdo.qemu-build@ubuntu@x86_64 - .fdo.qemu-build@ubuntu@x86_64
- .ci-commons-ubuntu@x86_64 - .ci-commons-ubuntu@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-16.4
stage: ubuntu_container_build stage: ubuntu_container_build
artifacts: artifacts:
name: logs-$CI_PIPELINE_ID name: logs-$CI_PIPELINE_ID
...@@ -230,7 +230,7 @@ ubuntu:18.04@qemu-build@x86_64: ...@@ -230,7 +230,7 @@ ubuntu:18.04@qemu-build@x86_64:
variables: variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl' FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.3 QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-16.4
ubuntu:18.04@qemu-check@x86_64: ubuntu:18.04@qemu-check@x86_64:
...@@ -260,7 +260,7 @@ do not rebuild ubuntu:18.04@container-build@x86_64: ...@@ -260,7 +260,7 @@ do not rebuild ubuntu:18.04@container-build@x86_64:
check labels ubuntu@x86_64:18.04: check labels ubuntu@x86_64:18.04:
extends: extends:
- ubuntu:18.04@check@x86_64 - ubuntu:18.04@check@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.3 image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-16.4
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})
......
...@@ -49,6 +49,19 @@ EOF ...@@ -49,6 +49,19 @@ EOF
if [[ $exit_code -eq 0 ]]; then if [[ $exit_code -eq 0 ]]; then
ssh -vvv -o StrictHostKeyChecking=accept-new vm uname -a ssh -vvv -o StrictHostKeyChecking=accept-new vm uname -a
exit_code=$? exit_code=$?
# Sometimes we get disconnected despite everything being ok. Let's
# try again, but this time without verbosity
if [[ $exit_code -ne 0 ]]; then
echo "SSH connect failed, retrying..."
retries=2
while [[ $exit_code -ne 0 ]] && [[ $retries -gt 0 ]]; do
sleep 10
ssh -o StrictHostKeyChecking=accept-new vm uname -a
exit_code=$?
retries=$(($retries - 1))
done
fi
fi fi
if [[ $exit_code -ne 0 ]]; then if [[ $exit_code -ne 0 ]]; then
......
## @bootstrap_tag: the current image tag associated with this bootstrap image ## @bootstrap_tag: the current image tag associated with this bootstrap image
bootstrap_tag: '2020-12-16.3' bootstrap_tag: '2020-12-16.4'
## @qemu_tag: the current image tag associated with this qemu bootstrap image ## @qemu_tag: the current image tag associated with this qemu bootstrap image
qemu_tag: '2020-12-16.3' qemu_tag: '2020-12-16.4'
## @ci_templates_registry_path: the path to where the templates should look ## @ci_templates_registry_path: the path to where the templates should look
## for bootstrap images. ## for bootstrap images.
......
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
# #
.fdo.container-build@alpine@x86_64: .fdo.container-build@alpine@x86_64:
extends: .fdo.container-build-common@alpine extends: .fdo.container-build-common@alpine
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.4
### ###
# Alias to ``.fdo.container-build@alpine@x86_64``. # Alias to ``.fdo.container-build@alpine@x86_64``.
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
# See ``.fdo.container-build@alpine@x86_64`` for details. # See ``.fdo.container-build@alpine@x86_64`` for details.
.fdo.container-build@alpine@aarch64: .fdo.container-build@alpine@aarch64:
extends: .fdo.container-build-common@alpine extends: .fdo.container-build-common@alpine
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.4
tags: tags:
- aarch64 - aarch64
......
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
# #
.fdo.container-build@arch@x86_64: .fdo.container-build@arch@x86_64:
extends: .fdo.container-build-common@arch extends: .fdo.container-build-common@arch
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.4
### ###
# Alias to ``.fdo.container-build@arch@x86_64``. # Alias to ``.fdo.container-build@arch@x86_64``.
......
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
# #
.fdo.container-build@centos@x86_64: .fdo.container-build@centos@x86_64:
extends: .fdo.container-build-common@centos extends: .fdo.container-build-common@centos
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.4
### ###
# Alias to ``.fdo.container-build@centos@x86_64``. # Alias to ``.fdo.container-build@centos@x86_64``.
......
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
# #
.fdo.container-build@debian@x86_64: .fdo.container-build@debian@x86_64:
extends: .fdo.container-build-common@debian extends: .fdo.container-build-common@debian
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.4
### ###
# Alias to ``.fdo.container-build@debian@x86_64``. # Alias to ``.fdo.container-build@debian@x86_64``.
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
# See ``.fdo.container-build@debian@x86_64`` for details. # See ``.fdo.container-build@debian@x86_64`` for details.
.fdo.container-build@debian@aarch64: .fdo.container-build@debian@aarch64:
extends: .fdo.container-build-common@debian extends: .fdo.container-build-common@debian
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.4
tags: tags:
- aarch64 - aarch64
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
extends: .fdo.container-build@debian@x86_64 extends: .fdo.container-build@debian@x86_64
tags: tags:
- kvm - kvm
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.4
script: script:
# log in to the registry # log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
...@@ -453,7 +453,7 @@ ...@@ -453,7 +453,7 @@
graphroot = "/var/lib/containers/storage" graphroot = "/var/lib/containers/storage"
EOF EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.3} - QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.4}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE - echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
# #
.fdo.container-build@fedora@x86_64: .fdo.container-build@fedora@x86_64:
extends: .fdo.container-build-common@fedora extends: .fdo.container-build-common@fedora
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.4
### ###
# Alias to ``.fdo.container-build@fedora@x86_64``. # Alias to ``.fdo.container-build@fedora@x86_64``.
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
# See ``.fdo.container-build@fedora@x86_64`` for details. # See ``.fdo.container-build@fedora@x86_64`` for details.
.fdo.container-build@fedora@aarch64: .fdo.container-build@fedora@aarch64:
extends: .fdo.container-build-common@fedora extends: .fdo.container-build-common@fedora
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.4
tags: tags:
- aarch64 - aarch64
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
extends: .fdo.container-build@fedora@x86_64 extends: .fdo.container-build@fedora@x86_64
tags: tags:
- kvm - kvm
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-16.4
script: script:
# log in to the registry # log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
graphroot = "/var/lib/containers/storage" graphroot = "/var/lib/containers/storage"
EOF EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.3} - QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-16.4}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE - echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
# #
.fdo.container-build@ubuntu@x86_64: .fdo.container-build@ubuntu@x86_64:
extends: .fdo.container-build-common@ubuntu extends: .fdo.container-build-common@ubuntu
image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-16.4
### ###
# Alias to ``.fdo.container-build@ubuntu@x86_64``. # Alias to ``.fdo.container-build@ubuntu@x86_64``.
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
# See ``.fdo.container-build@ubuntu@x86_64`` for details. # See ``.fdo.container-build@ubuntu@x86_64`` for details.
.fdo.container-build@ubuntu@aarch64: .fdo.container-build@ubuntu@aarch64:
extends: .fdo.container-build-common@ubuntu extends: .fdo.container-build-common@ubuntu
image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.3 image: quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-16.4
tags: tags:
- aarch64 - aarch64
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
extends: .fdo.container-build@ubuntu@x86_64 extends: .fdo.container-build@ubuntu@x86_64