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 (file)
index 0000000..8ad0b2b
--- /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 (file)
index e0db7af..0000000
--- 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 17de3b18487e9b97ff6ca83d180c088c9fd9df31..1e61d30c854552ee3211ff528f4844f31c0608b6 100644 (file)
--- 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 a7809b301051c5660146774050ea63bcaebbd3df..dc6d4f363eb4cbf762e914b7160201d7d0ffd488 100755 (executable)
--- 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" ;;