[gjs: 2/15] CI: Remove non-native architecture builds

[Philip Chimento <pchimento src gnome org>]

commit 0230c41e2d2d9cbf35792ac9c3e6c3add9ff69dc
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Sep 7 13:50:58 2019 -0700

    CI: Remove non-native architecture builds
    
    In practice, these were not being run very often, and when they did run
    it was often mystifying to debug if they failed. Nonetheless, Docker
    images were built every month for them, which took 5 hours each, rather
    than half an hour as for the rest of the images. Additionally, often the
    Docker images failed to build in the first place, as Fedora's GCC on that
    architecture would often turn up a bug while trying to compile
    SpiderMonkey.
    
    In general I have come to believe that it's downstreams' responsibility
    to ensure things work on any weird architectures that they ship on.
    However, it seems that we do have a native aarch64 runner in GNOME
    GitLab, so we can at least make use of that in the future, using less
    electricity than the current QEMU setup.

 .gitlab-ci.yml                          | 87 ---------------------------------
 test/extra/Dockerfile.arm64v8.fedora.29 | 11 -----
 test/extra/Dockerfile.ppc64le.fedora.29 | 11 -----
 test/extra/do_basic.sh                  | 13 ++---
 4 files changed, 4 insertions(+), 118 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1a9afdc..07804709 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,35 +94,6 @@ stages:
     # Done
     - *CI_footer
 
-# Cross (multi architecture) build
-.qemu: &multiarch
-  artifacts:
-    name: log
-    when: always
-    paths: *reg_files
-
-  image: docker:19.03.0
-  services:
-    - docker:19.03.0-dind
-  variables:
-    DOCKER_TLS_CERTDIR: ""
-
-  script:
-    # CI starts here. Previous messages are from GitLab Runner setup.
-    - *CI_header
-
-    # Register QEMU archs
-    - docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
-    # Run the multiarch test job using QEMU
-    - 'docker run -v $(pwd):/cwd
-          -e TEST=check -e TASK_ID=$TASK_ID $IMAGE
-          bash -e -c "cd /cwd && test/test-ci.sh GJS"
-    '
-
-    # Done
-    - *CI_footer
-
 #############################################
 #               Regular tests               #
 #############################################
@@ -434,29 +405,6 @@ zeal_11:
   except:
     - schedules
 
-# Multiarch Tests (weekly)
-armv8:
-  <<: *multiarch
-  stage: manual
-  variables:
-    TASK_ID: "fedora-armv8-gcc-default-default-check"
-    DOCKER_DRIVER: overlay
-    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev.aarch64"
-  when: manual
-  except:
-    - schedules
-
-ppc64le:
-  <<: *multiarch
-  stage: manual
-  variables:
-    TASK_ID: "fedora-ppc64le-gcc-default-default-check"
-    DOCKER_DRIVER: overlay
-    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev.ppc64le"
-  when: manual
-  except:
-    - schedules
-
 #############################################
 #          Create CI Docker Images          #
 #############################################
@@ -480,13 +428,6 @@ ppc64le:
         exit 0
       fi
 
-    # Get multiarch stuff
-    - |
-      if [[ -n "${TARGET_ARCH}" ]]; then
-        docker run --rm --privileged multiarch/qemu-user-static:register --reset
-        wget 
https://github.com/multiarch/qemu-user-static/releases/download/v2.12.0/x86_64_qemu-${TARGET_ARCH}-static.tar.gz
-      fi
-
     # Build using the Dockerfile
     - |
       if [[ -n "${DOCKERFILE}" ]]; then
@@ -549,34 +490,6 @@ SM60-debug-gcc.fedora-dev:
     IMAGE: "fedora:rawhide"
     NAME: "SM60-debug-gcc.fedora-dev"
 
-SM60-gcc.fedora-dev.aarch64:
-  <<: *create_docker_image
-  variables:
-    BASE: "fedora"
-    DEV: "devel"
-    DOCKER_DRIVER: overlay
-    # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
-    DOCKER_TLS_CERTDIR: ""
-    DOCKERFILE: "test/extra/Dockerfile.arm64v8.fedora.29"
-    IMAGE: "${CI_REGISTRY_IMAGE}:SM60-gcc.fedora-dev.aarch64"
-    NAME: "SM60-gcc.fedora-dev.aarch64"
-    STATIC: "qemu"
-    TARGET_ARCH: "aarch64"
-
-SM60-gcc.fedora-dev.ppc64le:
-  <<: *create_docker_image
-  variables:
-    BASE: "fedora"
-    DEV: "devel"
-    DOCKER_DRIVER: overlay
-    # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
-    DOCKER_TLS_CERTDIR: ""
-    DOCKERFILE: "test/extra/Dockerfile.ppc64le.fedora.29"
-    IMAGE: "${CI_REGISTRY_IMAGE}:SM60-gcc.fedora-dev.ppc64le"
-    NAME: "SM60-gcc.fedora-dev.ppc64le"
-    STATIC: "qemu"
-    TARGET_ARCH: "ppc64le"
-
 SM60-gcc.ubuntu-dev:
   <<: *create_docker_image
   variables:
diff --git a/test/extra/do_basic.sh b/test/extra/do_basic.sh
index aa7a6bf2..72af6483 100755
--- a/test/extra/do_basic.sh
+++ b/test/extra/do_basic.sh
@@ -19,11 +19,7 @@ function do_Install_Dependencies(){
                                libedit-dev libgl1-mesa-dev lcov libreadline-dev
 
     elif [[ $BASE == "fedora" ]]; then
-        if [[ $STATIC == *"qemu"* ]]; then
-            dnf -y --nogpgcheck upgrade --best --allowerasing
-        else
-            dnf -y upgrade --best --allowerasing
-        fi
+        dnf -y upgrade --best --allowerasing
 
         # Base dependencies
         dnf -y    install @c-development @development-tools clang redhat-rpm-config gnome-common 
python-devel \
@@ -60,9 +56,8 @@ function do_Install_Extras(){
         # Distros development versions of needed libraries
         dnf -y install gobject-introspection-devel
 
-        if [[ $STATIC != *"qemu"* ]]; then
-            # Distros debug info of needed libraries
-            dnf -y debuginfo-install glib2-devel gobject-introspection-devel gtk3-devel expat fontconfig 
cairo glibc
-        fi
+        # Distros debug info of needed libraries
+        dnf -y debuginfo-install glib2-devel gobject-introspection-devel \
+          gtk3-devel expat fontconfig cairo glibc
     fi
 }