Commit 0a522a46 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Bump bootstrap base image and packages



A few changes that are worth mentioning:
- we no longer lock the buildah/podman versions as the bugs
  that prevented us to run those in a privileged docker
  containers are now fixed upstream and in fedora
- we need to install runc in addition to crun in the base
  buildah image to accomodate cgroups v1 and v2
- the qemu image now inherits from the base buildah image
  allowing us to not have to redeclare the base packages
  we need there, and to not have to run the entire
  `bootstrap.sh` script there to have a working container
Signed-off-by: Benjamin Tissoires's avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
parent 6f5af7e5
......@@ -27,7 +27,7 @@
extends:
- .fdo.container-build@alpine
- .ci-commons-alpine
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
stage: alpine_container_build
......@@ -35,7 +35,7 @@
extends:
- .fdo.container-build@alpine@arm64v8
- .ci-commons-alpine
image: $CI_REGISTRY_IMAGE/arm64v8/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/arm64v8/buildah:2020-07-20.1
stage: alpine_container_build
needs:
- bootstrap@arm64v8
......@@ -186,7 +186,7 @@ do not rebuild alpine:latest@container-build:
check labels alpine:latest:
extends:
- alpine:latest@check
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -27,7 +27,7 @@
extends:
- .fdo.container-build@arch
- .ci-commons-arch
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
stage: arch_container_build
......@@ -158,7 +158,7 @@ do not rebuild arch:rolling@container-build:
check labels arch:rolling:
extends:
- arch:rolling@check
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -28,7 +28,7 @@
extends:
- .fdo.container-build@centos
- .ci-commons-centos
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
stage: centos_container_build
......@@ -159,7 +159,7 @@ do not rebuild centos:7@container-build:
check labels centos:7:
extends:
- centos:7@check
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -28,7 +28,7 @@
extends:
- .fdo.container-build@debian
- .ci-commons-debian
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
stage: debian_container_build
......@@ -36,7 +36,7 @@
extends:
- .fdo.container-build@debian@arm64v8
- .ci-commons-debian
image: $CI_REGISTRY_IMAGE/arm64v8/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/arm64v8/buildah:2020-07-20.1
stage: debian_container_build
needs:
- bootstrap@arm64v8
......@@ -50,7 +50,7 @@
extends:
- .fdo.qemu-build@debian
- .ci-commons-debian
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-03-24
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-07-20.3
stage: debian_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -224,7 +224,7 @@ debian:stretch@qemu-build:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-03-24
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-07-20.3
debian:stretch@qemu-check:
......@@ -257,7 +257,7 @@ do not rebuild debian:stretch@container-build:
check labels debian:stretch:
extends:
- debian:stretch@check
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -28,7 +28,7 @@
extends:
- .fdo.container-build@fedora
- .ci-commons-fedora
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
stage: fedora_container_build
......@@ -36,7 +36,7 @@
extends:
- .fdo.container-build@fedora@arm64v8
- .ci-commons-fedora
image: $CI_REGISTRY_IMAGE/arm64v8/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/arm64v8/buildah:2020-07-20.1
stage: fedora_container_build
needs:
- bootstrap@arm64v8
......@@ -50,7 +50,7 @@
extends:
- .fdo.qemu-build@fedora
- .ci-commons-fedora
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-03-24
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-07-20.3
stage: fedora_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -224,7 +224,7 @@ fedora:31@qemu-build:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-03-24
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-07-20.3
fedora:31@qemu-check:
......@@ -257,7 +257,7 @@ do not rebuild fedora:31@container-build:
check labels fedora:31:
extends:
- fedora:31@check
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -28,7 +28,7 @@
extends:
- .fdo.container-build@ubuntu
- .ci-commons-ubuntu
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
stage: ubuntu_container_build
......@@ -36,7 +36,7 @@
extends:
- .fdo.container-build@ubuntu@arm64v8
- .ci-commons-ubuntu
image: $CI_REGISTRY_IMAGE/arm64v8/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/arm64v8/buildah:2020-07-20.1
stage: ubuntu_container_build
needs:
- bootstrap@arm64v8
......@@ -50,7 +50,7 @@
extends:
- .fdo.qemu-build@ubuntu
- .ci-commons-ubuntu
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-03-24
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-07-20.3
stage: ubuntu_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -224,7 +224,7 @@ ubuntu:19.10@qemu-build:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-03-24
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-07-20.3
ubuntu:19.10@qemu-check:
......@@ -257,7 +257,7 @@ do not rebuild ubuntu:19.10@container-build:
check labels ubuntu:19.10:
extends:
- ubuntu:19.10@check
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
script:
# FDO_DISTRIBUTION_IMAGE still has indirections
- DISTRO_IMAGE=$(eval echo ${FDO_DISTRIBUTION_IMAGE})
......
......@@ -9,8 +9,9 @@ dnf install -y --setopt=install_weak_deps=False \
jq \
git-core \
diffutils \
buildah-1.11.3-2.fc31 \
podman-2:1.6.2-2.fc31
buildah \
podman \
runc
cat > /etc/containers/registries.conf <<EOF
# This is a system-wide configuration file used to
......
......@@ -18,8 +18,8 @@
stage: bootstrapping
variables:
FDO_UPSTREAM_REPO: freedesktop/ci-templates
FDO_DISTRIBUTION_VERSION: '31'
FDO_DISTRIBUTION_TAG: '2020-03-24'
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_TAG: '2020-07-20.1'
# we need a minimalist image capable of buildah, podman, skopeo, curl,
......@@ -28,7 +28,7 @@
# end up building a regular container image from arch.
.bootstrap:
extends: .bootstrap_skeleton
image: fedora:31
image: fedora:32
before_script:
- bash bootstrap/bootstrap.sh
variables:
......@@ -53,13 +53,14 @@
# - usbutils (for being able to call lsusb and redirect part a USB device)
.qemu:
extends: .bootstrap_skeleton
image: $CI_REGISTRY_IMAGE/buildah:2020-03-24
image: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
stage: bootstrapping_qemu
dependencies: []
variables:
FDO_DISTRIBUTION_TAG: '2020-03-24'
FDO_DISTRIBUTION_TAG: '2020-07-20.3'
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
FDO_REPO_SUFFIX: qemu-base
FDO_DISTRIBUTION_PACKAGES: 'buildah-1.11.3-2.fc31 podman-2:1.6.2-2.fc31 skopeo jq git qemu genisoimage usbutils'
FDO_DISTRIBUTION_PACKAGES: 'qemu genisoimage usbutils'
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl'
# qemu container capable of creating an other VM image
......
......@@ -18,7 +18,7 @@
stage: bootstrapping
variables:
FDO_UPSTREAM_REPO: freedesktop/ci-templates
FDO_DISTRIBUTION_VERSION: '31'
FDO_DISTRIBUTION_VERSION: '32'
FDO_DISTRIBUTION_TAG: '{{bootstrap_tag}}'
......@@ -28,7 +28,7 @@
# end up building a regular container image from arch.
.bootstrap:
extends: .bootstrap_skeleton
image: fedora:31
image: fedora:32
before_script:
- bash bootstrap/bootstrap.sh
variables:
......@@ -58,8 +58,9 @@
dependencies: []
variables:
FDO_DISTRIBUTION_TAG: '{{qemu_tag}}'
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/buildah:{{bootstrap_tag}}
FDO_REPO_SUFFIX: qemu-base
FDO_DISTRIBUTION_PACKAGES: 'buildah-1.11.3-2.fc31 podman-2:1.6.2-2.fc31 skopeo jq git qemu genisoimage usbutils'
FDO_DISTRIBUTION_PACKAGES: 'qemu genisoimage usbutils'
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl'
# qemu container capable of creating an other VM image
......
......@@ -133,7 +133,7 @@ globals:
- 'sh test/script.sh'
## @bootstrap_tag: the current image tag associated with this bootstrap image
bootstrap_tag: '2020-03-24'
bootstrap_tag: '2020-07-20.1'
## @qemu_tag: the current image tag associated with this qemu bootstrap image
qemu_tag: '2020-03-24'
qemu_tag: '2020-07-20.3'
......@@ -179,7 +179,7 @@
#
.fdo.container-build@alpine:
extends: .fdo.alpine
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-07-20.1
stage: build
script:
# log in to the registry
......@@ -282,7 +282,7 @@
# See ``.fdo.container-build@alpine`` for details.
.fdo.container-build@alpine@arm64v8:
extends: .fdo.container-build@alpine
image: $CI_REGISTRY/freedesktop/ci-templates/arm64v8/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/arm64v8/buildah:2020-07-20.1
tags:
- aarch64
......
......@@ -179,7 +179,7 @@
#
.fdo.container-build@arch:
extends: .fdo.arch
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-07-20.1
stage: build
script:
# log in to the registry
......
......@@ -185,7 +185,7 @@
#
.fdo.container-build@centos:
extends: .fdo.centos
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-07-20.1
stage: build
script:
# log in to the registry
......
......@@ -185,7 +185,7 @@
#
.fdo.container-build@debian:
extends: .fdo.debian
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-07-20.1
stage: build
script:
# log in to the registry
......@@ -297,7 +297,7 @@
# See ``.fdo.container-build@debian`` for details.
.fdo.container-build@debian@arm64v8:
extends: .fdo.container-build@debian
image: $CI_REGISTRY/freedesktop/ci-templates/arm64v8/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/arm64v8/buildah:2020-07-20.1
tags:
- aarch64
......@@ -313,7 +313,7 @@
extends: .fdo.container-build@debian
tags:
- kvm
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-07-20.3
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -411,7 +411,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-03-24}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-07-20.3}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
......@@ -185,7 +185,7 @@
#
.fdo.container-build@fedora:
extends: .fdo.fedora
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-07-20.1
stage: build
script:
# log in to the registry
......@@ -287,7 +287,7 @@
# See ``.fdo.container-build@fedora`` for details.
.fdo.container-build@fedora@arm64v8:
extends: .fdo.container-build@fedora
image: $CI_REGISTRY/freedesktop/ci-templates/arm64v8/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/arm64v8/buildah:2020-07-20.1
tags:
- aarch64
......@@ -303,7 +303,7 @@
extends: .fdo.container-build@fedora
tags:
- kvm
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-07-20.3
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -402,7 +402,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-03-24}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-07-20.3}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
......@@ -185,7 +185,7 @@
#
.fdo.container-build@ubuntu:
extends: .fdo.ubuntu
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/buildah:2020-07-20.1
stage: build
script:
# log in to the registry
......@@ -296,7 +296,7 @@
# See ``.fdo.container-build@ubuntu`` for details.
.fdo.container-build@ubuntu@arm64v8:
extends: .fdo.container-build@ubuntu
image: $CI_REGISTRY/freedesktop/ci-templates/arm64v8/buildah:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/arm64v8/buildah:2020-07-20.1
tags:
- aarch64
......@@ -312,7 +312,7 @@
extends: .fdo.container-build@ubuntu
tags:
- kvm
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-03-24
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-07-20.3
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -455,7 +455,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-03-24}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-07-20.3}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
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