From 55ec6d34a4c188efc04c244ab06bf7bbdcbceb73 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Lopez Date: Thu, 13 Jan 2022 12:01:15 +0100 Subject: [PATCH] Cirrus CI: add dockerfile for Fedora 35 This dockerfile is the source for the pre-built container at https://quay.io/repository/avocado-framework/avocado-vt-ci-fedora-35 Remove old dockerfiles. Signed-off-by: Ana Guerrero Lopez --- .cirrus.yml | 6 +++--- contrib/containers/ci/fedora-30.docker | 4 ---- .../containers/ci/{fedora-34.docker => fedora-35.docker} | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 contrib/containers/ci/fedora-30.docker rename contrib/containers/ci/{fedora-34.docker => fedora-35.docker} (97%) diff --git a/.cirrus.yml b/.cirrus.yml index 9a03913c57..f8224d3ccd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,9 +2,9 @@ env: CIRRUS_CLONE_DEPTH: 1 VT_TYPE: qemu -fedora_34_task: +fedora_35_task: container: - image: quay.io/avocado-framework/avocado-vt-ci-fedora-34 + image: quay.io/avocado-framework/avocado-vt-ci-fedora-35 kvm: true env: matrix: @@ -65,7 +65,7 @@ centos_8_1_task: avocado_devel_task: container: - image: quay.io/avocado-framework/avocado-vt-ci-fedora-34 + image: quay.io/avocado-framework/avocado-vt-ci-fedora-35 kvm: true allow_failures: $AVOCADO_SRC == 'git+https://github.com/avocado-framework/avocado#egg=avocado_framework' env: diff --git a/contrib/containers/ci/fedora-30.docker b/contrib/containers/ci/fedora-30.docker deleted file mode 100644 index d8294f21fc..0000000000 --- a/contrib/containers/ci/fedora-30.docker +++ /dev/null @@ -1,4 +0,0 @@ -FROM fedora:30 -LABEL description "Fedora image used on integration checks, such as cirrus-ci" -RUN dnf -y install git xz tcpdump nc iproute iputils gcc python3-devel qemu-kvm qemu-img -RUN dnf -y clean all diff --git a/contrib/containers/ci/fedora-34.docker b/contrib/containers/ci/fedora-35.docker similarity index 97% rename from contrib/containers/ci/fedora-34.docker rename to contrib/containers/ci/fedora-35.docker index edc73f55ff..861e2f11f1 100644 --- a/contrib/containers/ci/fedora-34.docker +++ b/contrib/containers/ci/fedora-35.docker @@ -1,4 +1,4 @@ -FROM fedora:34 +FROM fedora:35 LABEL description "Fedora image used on integration checks, such as cirrus-ci" RUN dnf -y install make python3-wheel python3-pip git xz tcpdump nc iproute iputils gcc python3-devel qemu-kvm qemu-img RUN dnf -y clean all