[gjs: 1/10] CI: Rebuild CI image on Fedora 36

[Philip Chimento <pchimento src gnome org>]

commit 799ed9545604d3b8c411291a88ba59394ab2ef4a
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Jul 22 21:10:34 2022 -0700

    CI: Rebuild CI image on Fedora 36
    
    mozjs91 cannot be built with Python 3.10 due to a bug, so we have to
    install Python 3.9 separately and use it.
    
    glibc-debuginfo-common no longer exists in Fedora 36.
    
    Requires a bump of the freedesktop CI template as well, due to broken
    seccomp on the older buildah image.

 .gitlab-ci.yml              |  2 +-
 test/extra/Dockerfile       | 20 +++++++++++++++-----
 test/extra/Dockerfile.debug | 27 ++++++++++++++++++++-------
 3 files changed, 36 insertions(+), 13 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 981ff046d..7bd516b7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -388,7 +388,7 @@ zeal_11:
 #          Create CI Docker Images          #
 #############################################
 .Docker image template: &create_docker_image
-  image: registry.freedesktop.org/freedesktop/ci-templates/x86_64/buildah:2020-10-30.1
+  image: quay.io/freedesktop.org/ci-templates:container-build-base-2022-05-25.0
   stage: deploy
   only:
     variables:
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index de78be30c..8a0682ac6 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -3,15 +3,25 @@
 
 # === Build Spidermonkey stage ===
 
-FROM registry.fedoraproject.org/fedora:34 AS mozjs-build
+FROM registry.fedoraproject.org/fedora:36 AS mozjs-build
 ARG MOZJS_BRANCH=mozjs91
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
 ARG BUILD_OPTS=
 
 ENV SHELL=/bin/bash
 
-RUN dnf -y install 'dnf-command(builddep)' autoconf213 git make which llvm-devel \
-    xz clang llvm rust
+# mozjs91 cannot be built with python3.10
+RUN dnf -y install 'dnf-command(builddep)' \
+    autoconf213 \
+    clang \
+    git \
+    llvm \
+    llvm-devel \
+    make \
+    python3.9 \
+    rust \
+    which \
+    xz
 RUN dnf -y builddep ${MOZJS_BUILDDEPS}
 
 WORKDIR /root
@@ -21,6 +31,7 @@ RUN mkdir -p mozjs/_build
 
 WORKDIR /root/mozjs/_build
 
+ENV PYTHON3=/usr/bin/python3.9
 RUN ../js/src/configure --prefix=/usr --libdir=/usr/lib64 --disable-jemalloc \
     --with-system-zlib --with-intl-api ${BUILD_OPTS}
 RUN make -j$(nproc)
@@ -29,7 +40,7 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
 
 # === Actual Docker image ===
 
-FROM registry.fedoraproject.org/fedora:34
+FROM registry.fedoraproject.org/fedora:36
 
 ARG LOCALES=tr_TR
 ENV SHELL=/bin/bash
@@ -57,7 +68,6 @@ RUN dnf -y install --enablerepo=fedora-debuginfo,updates-debuginfo \
     glib2-debugsource \
     glib2-devel \
     glibc-debuginfo \
-    glibc-debuginfo-common \
     glibc-locale-source \
     gnome-desktop-testing \
     gobject-introspection-debuginfo \
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index 4548e078a..415418b7f 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -3,23 +3,36 @@
 
 # === Build stage ===
 
-FROM registry.fedoraproject.org/fedora:34 AS build
+FROM registry.fedoraproject.org/fedora:36 AS build
 ARG MOZJS_BRANCH=mozjs91
 ARG MOZJS_BUILDDEPS=${MOZJS_BRANCH}
 ARG BUILD_OPTS=
 
 ENV SHELL=/bin/bash
 
-RUN dnf -y install 'dnf-command(builddep)' autoconf213 clang-devel cmake git \
-    llvm-devel make ninja-build which xz clang llvm rust
+# mozjs91 cannot be built with python3.10
+RUN dnf -y install 'dnf-command(builddep)' \
+    autoconf213 \
+    clang \
+    clang-devel \
+    cmake \
+    git \
+    llvm \
+    llvm-devel \
+    make \
+    ninja-build \
+    python3.9 \
+    rust \
+    which \
+    xz
 RUN dnf -y builddep ${MOZJS_BUILDDEPS}
 
 WORKDIR /root
 
 RUN mkdir -p include-what-you-use/_build
-ADD https://include-what-you-use.org/downloads/include-what-you-use-0.16.src.tar.gz 
/root/include-what-you-use/
+ADD https://include-what-you-use.org/downloads/include-what-you-use-0.18.src.tar.gz 
/root/include-what-you-use/
 WORKDIR /root/include-what-you-use
-RUN tar xzf include-what-you-use-0.16.src.tar.gz --strip-components=1
+RUN tar xzf include-what-you-use-0.18.src.tar.gz --strip-components=1
 
 WORKDIR /root/include-what-you-use/_build
 
@@ -34,6 +47,7 @@ RUN mkdir -p mozjs/_build
 
 WORKDIR /root/mozjs/_build
 
+ENV PYTHON3=/usr/bin/python3.9
 RUN ../js/src/configure --prefix=/usr --libdir=/usr/lib64 --disable-jemalloc \
     --with-system-zlib --with-intl-api --enable-debug \
     ${BUILD_OPTS}
@@ -43,7 +57,7 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
 
 # === Actual Docker image ===
 
-FROM registry.fedoraproject.org/fedora:34
+FROM registry.fedoraproject.org/fedora:36
 
 ARG LOCALES=tr_TR
 ENV SHELL=/bin/bash
@@ -71,7 +85,6 @@ RUN dnf -y install --enablerepo=fedora-debuginfo,updates-debuginfo \
     glib2-debugsource \
     glib2-devel \
     glibc-debuginfo \
-    glibc-debuginfo-common \
     glibc-locale-source \
     gnome-desktop-testing \
     gobject-introspection-debuginfo \