| Message ID | 1560250596-26821-1-git-send-email-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | automation: Fix CI with the fedora container | expand |
On 11/06/2019 11:56, Andrew Cooper wrote: > 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> > --- > CC: Wei Liu <wl@xen.org> > CC: Doug Goldstein <cardoe@cardoe.com> > > I have already pushed an "updated" fedora:latest container which is actually > 29 to unblock existing CI, and pushed fedora:29 built from this dockerfile. https://gitlab.com/xen-project/people/andyhhp/xen/pipelines/65651062 is a run with this change in place. ~Andrew
On Tue, Jun 11, 2019 at 11:56:36AM +0100, Andrew Cooper wrote: > 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/latest.dockerfile b/automation/build/fedora/29.dockerfile similarity index 97% rename from automation/build/fedora/latest.dockerfile rename to automation/build/fedora/29.dockerfile index e0db7af..8ad0b2b 100644 --- a/automation/build/fedora/latest.dockerfile +++ b/automation/build/fedora/29.dockerfile @@ -1,4 +1,4 @@ -FROM fedora:latest +FROM fedora:29 LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 17de3b1..1e61d30 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 a7809b3..dc6d4f3 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" ;;
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> --- CC: Wei Liu <wl@xen.org> CC: Doug Goldstein <cardoe@cardoe.com> I have already pushed an "updated" fedora:latest container which is actually 29 to unblock existing CI, and pushed fedora:29 built from this dockerfile. --- automation/build/fedora/{latest.dockerfile => 29.dockerfile} | 2 +- automation/gitlab-ci/build.yaml | 4 ++-- automation/scripts/containerize | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename automation/build/fedora/{latest.dockerfile => 29.dockerfile} (97%)