From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 11 Jun 2019 10:09:06 +0000 (+0100)
Subject: automation: Fix CI with the fedora container
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2067
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f093199132605220ad27cb516e12d12a36f02760;p=xen.git

automation: Fix CI with the fedora container

A recent rebuild of the CI contaniers switched from Fedora 29 to 30 because
the dockerfile is targetting latest.

Unfortunately, the version of iPXE in master doesn't build with the default
GCC in Fedora 30, which is blocking all CI activity.

Switch from latest to an explicit version, to avoid future breakage.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Doug Goldstein <cardoe@cardoe.com>
---

diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile
new file mode 100644
index 0000000000..8ad0b2baf7
--- /dev/null
+++ b/automation/build/fedora/29.dockerfile
@@ -0,0 +1,43 @@
+FROM fedora:29
+LABEL maintainer.name="The Xen Project" \
+      maintainer.email="xen-devel@lists.xenproject.org"
+
+RUN mkdir /build
+WORKDIR /build
+
+# install Xen depends
+RUN dnf -y install \
+        clang \
+        gcc \
+        gcc-c++ \
+        ncurses-devel \
+        zlib-devel \
+        openssl-devel \
+        python-devel \
+        libuuid-devel \
+        pkgconfig \
+        gettext \
+        flex \
+        bison \
+        libaio-devel \
+        glib2-devel \
+        yajl-devel \
+        pixman-devel \
+        glibc-devel \
+        glibc-devel.i686 \
+        make \
+        binutils \
+        git \
+        wget \
+        acpica-tools \
+        python-markdown \
+        patch \
+        checkpolicy \
+        dev86 \
+        xz-devel \
+        bzip2 \
+        nasm \
+        ocaml \
+        ocaml-findlib \
+    && dnf clean all && \
+    rm -rf /var/cache/dnf
diff --git a/automation/build/fedora/latest.dockerfile b/automation/build/fedora/latest.dockerfile
deleted file mode 100644
index e0db7afad8..0000000000
--- a/automation/build/fedora/latest.dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM fedora:latest
-LABEL maintainer.name="The Xen Project" \
-      maintainer.email="xen-devel@lists.xenproject.org"
-
-RUN mkdir /build
-WORKDIR /build
-
-# install Xen depends
-RUN dnf -y install \
-        clang \
-        gcc \
-        gcc-c++ \
-        ncurses-devel \
-        zlib-devel \
-        openssl-devel \
-        python-devel \
-        libuuid-devel \
-        pkgconfig \
-        gettext \
-        flex \
-        bison \
-        libaio-devel \
-        glib2-devel \
-        yajl-devel \
-        pixman-devel \
-        glibc-devel \
-        glibc-devel.i686 \
-        make \
-        binutils \
-        git \
-        wget \
-        acpica-tools \
-        python-markdown \
-        patch \
-        checkpolicy \
-        dev86 \
-        xz-devel \
-        bzip2 \
-        nasm \
-        ocaml \
-        ocaml-findlib \
-    && dnf clean all && \
-    rm -rf /var/cache/dnf
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 17de3b1848..1e61d30c85 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -341,12 +341,12 @@ debian-unstable-32-gcc-debug:
 fedora-gcc:
   extends: .gcc-x86-64-build
   variables:
-    CONTAINER: fedora:latest
+    CONTAINER: fedora:29
 
 fedora-gcc-debug:
   extends: .gcc-x86-64-build-debug
   variables:
-    CONTAINER: fedora:latest
+    CONTAINER: fedora:29
 
 # Ubuntu Trusty's Clang is 3.4 while Xen requires 3.5
 
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index a7809b3010..dc6d4f363e 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -19,7 +19,7 @@ case "_${CONTAINER}" in
     _centos6) CONTAINER="${BASE}/centos:6" ;;
     _centos7) CONTAINER="${BASE}/centos:7" ;;
     _centos72) CONTAINER="${BASE}/centos:7.2" ;;
-    _fedora) CONTAINER="${BASE}/fedora:latest";;
+    _fedora) CONTAINER="${BASE}/fedora:29";;
     _jessie) CONTAINER="${BASE}/debian:jessie" ;;
     _stretch|_) CONTAINER="${BASE}/debian:stretch" ;;
     _trusty) CONTAINER="${BASE}/ubuntu:trusty" ;;