From 2b85bfb03052b56591b06abe62c71e36170dc9a0 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Fri, 7 Aug 2020 10:10:52 +0300 Subject: [PATCH] Azure: Switch to dockerhub provider `registry.fedoraproject.org/f32/fedora-toolbox` image is used to build packages on Azure Pipelines. registry.fedoraproject.org experiences an availability problem and makes unstable FreeIPA CI. Fedora also distributes its official images on https://hub.docker.com/_/fedora. `fedora:32` is already used by FreeIPA CI to build the image for tests. Signed-off-by: Stanislav Levin Reviewed-By: Alexander Bokovoy Reviewed-By: Francois Cami --- freeipa.spec.in | 1 + ipatests/azure/Dockerfiles/Dockerfile.build.fedora | 4 ---- ipatests/azure/templates/prepare-build-fedora.yml | 1 + ipatests/azure/templates/variables-fedora.yml | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index c831cc13c..b047cdf5e 100755 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -262,6 +262,7 @@ BuildRequires: python3-m2r BuildRequires: jsl BuildRequires: rpmlint BuildRequires: softhsm +BuildRequires: keyutils BuildRequires: python3-augeas BuildRequires: python3-cffi BuildRequires: python3-cryptography >= 1.6 diff --git a/ipatests/azure/Dockerfiles/Dockerfile.build.fedora b/ipatests/azure/Dockerfiles/Dockerfile.build.fedora index 07fc573a8..674bf60ed 100644 --- a/ipatests/azure/Dockerfiles/Dockerfile.build.fedora +++ b/ipatests/azure/Dockerfiles/Dockerfile.build.fedora @@ -4,10 +4,6 @@ ENV container=docker LANG=en_US.utf8 LANGUAGE=en_US.utf8 LC_ALL=en_US.utf8 ADD dist /root RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \ - && dnf install -y dnf-plugins-core \ - && dnf config-manager --set-enabled updates-testing \ - && dnf config-manager --set-enabled updates-testing-modular \ - && dnf config-manager --set-disabled fedora-cisco-openh264 \ && dnf update -y dnf \ && sed -i 's/%_install_langs \(.*\)/\0:fr/g' /etc/rpm/macros.image-language-conf \ && dnf install -y systemd \ diff --git a/ipatests/azure/templates/prepare-build-fedora.yml b/ipatests/azure/templates/prepare-build-fedora.yml index b628488fe..862a6ff19 100644 --- a/ipatests/azure/templates/prepare-build-fedora.yml +++ b/ipatests/azure/templates/prepare-build-fedora.yml @@ -5,6 +5,7 @@ steps: sudo dnf makecache || : echo "Installing base development environment" sudo dnf install -y \ + 'dnf-command(builddep)' \ gdb-minimal \ make \ autoconf \ diff --git a/ipatests/azure/templates/variables-fedora.yml b/ipatests/azure/templates/variables-fedora.yml index 8475fc40e..9440942f7 100644 --- a/ipatests/azure/templates/variables-fedora.yml +++ b/ipatests/azure/templates/variables-fedora.yml @@ -1,7 +1,7 @@ variables: IPA_PLATFORM: fedora # the Docker public image to build IPA packages (rpms) - DOCKER_BUILD_IMAGE: 'registry.fedoraproject.org/f32/fedora-toolbox' + DOCKER_BUILD_IMAGE: 'fedora:32' # the Dockerfile to build Docker image for running IPA tests DOCKER_DOCKERFILE: ${{ format('Dockerfile.build.{0}', variables.IPA_PLATFORM) }}