From ed7cefe21789bf688abfa710d4372ffbd3e50368 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 31 Jan 2021 17:38:45 +0000
Subject: [PATCH] ci: factor out Fedora Rawhide CI setup

To run Fedora Rawhide based aarch64 containers on Drone CI our current
Dockerfile setup does not work.

This moves the package installation out of the Dockerfile into
scripts/ci/prepare-for-fedora-rawhide.sh to be usable in the Dockerfile
environment and in the Drone CI environment.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/build/Dockerfile.fedora.tmpl     | 39 ++----------------------
 scripts/ci/prepare-for-fedora-rawhide.sh | 37 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100755 scripts/ci/prepare-for-fedora-rawhide.sh

diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 184f0019a..918849a7b 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -1,42 +1,8 @@
 ARG CC=gcc
 ARG ENV1=FOOBAR
 
-RUN dnf install -y \
-	ccache \
-	diffutils \
-	findutils \
-	gcc \
-	git \
-	gnutls-devel \
-	gzip \
-	iproute \
-	iptables \
-	nftables \
-	nftables-devel \
-	libaio-devel \
-	libasan \
-	libcap-devel \
-	libnet-devel \
-	libnl3-devel \
-	make \
-	procps-ng \
-	protobuf-c-devel \
-	protobuf-devel \
-	python3-flake8 \
-	python3-PyYAML \
-	python3-future \
-	python3-protobuf \
-	python3-junit_xml \
-	redhat-rpm-config \
-	sudo \
-	tar \
-	which \
-	e2fsprogs \
-	rubygem-asciidoctor \
-	kmod
-
-RUN ln -sf python3 /usr/bin/python
-ENV PYTHON=python3
+COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh
+RUN /bin/prepare-for-fedora-rawhide.sh
 
 COPY . /criu
 WORKDIR /criu
@@ -49,4 +15,3 @@ RUN mv .ccache /tmp && make mrproper && ccache -sz  && \
 RUN adduser -u 1000 test
 
 RUN make -C test/zdtm -j $(nproc)
-
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
new file mode 100755
index 000000000..1b2273b3b
--- /dev/null
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e -x
+
+dnf install -y \
+	ccache \
+	diffutils \
+	findutils \
+	gcc \
+	git \
+	gnutls-devel \
+	gzip \
+	iproute \
+	iptables \
+	nftables \
+	nftables-devel \
+	libaio-devel \
+	libasan \
+	libcap-devel \
+	libnet-devel \
+	libnl3-devel \
+	make \
+	procps-ng \
+	protobuf-c-devel \
+	protobuf-devel \
+	python3-flake8 \
+	python3-PyYAML \
+	python3-future \
+	python3-protobuf \
+	python3-junit_xml \
+	python-unversioned-command \
+	redhat-rpm-config \
+	sudo \
+	tar \
+	which \
+	e2fsprogs \
+	rubygem-asciidoctor \
+	kmod