[gjs: 12/15] CI: Remove jhbuild from CI scripts

[Philip Chimento <pchimento src gnome org>]

commit a2bef43e08d65f4784e0e0059b0ee14f884bc07f
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Sep 7 22:45:49 2019 -0700

    CI: Remove jhbuild from CI scripts
    
    To the best of my knowledge, no remaining jobs used jhbuild for
    anything. We can remove the "DEV: jhbuild" case from everywhere and also
    remove jhbuild from the Docker image builds. (The Docker images do still
    install SpiderMonkey into /root/jhbuild/install, but we will change that
    in the next phase.)
    
    Since we no longer build m4-common with jhbuild in the Docker image
    build, we need to install the autoconf-archive package instead.

 .gitlab-ci.yml               |  7 -----
 test/ci-images.sh            |  1 -
 test/extra/do_basic.sh       |  2 +-
 test/extra/do_docker.sh      |  6 ----
 test/extra/do_environment.sh | 67 +-------------------------------------------
 test/extra/do_mozilla.sh     | 30 --------------------
 test/test-ci.sh              | 42 ++++++++-------------------
 7 files changed, 13 insertions(+), 142 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c41dccfd..b0c4ea64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,16 +21,9 @@ stages:
        echo "*********************************************";
     '
 
-.JHBuild files: &JHB_files  [.cache/jhbuild/build/gjs/*.log, .cache/jhbuild/build/gjs/Makefile, 
.cache/jhbuild/build/gjs/configure]
 .Coverage files: &cov_files [configure, Makefile, ./*.log, ./*.trs, ./installed-tests/scripts/*.log, 
./installed-tests/scripts/*.trs, coverage/]
 .Regular files: &reg_files  [configure, Makefile, ./*.log, ./*.trs, ./installed-tests/scripts/*.log, 
./installed-tests/scripts/*.trs]
 
-.jhbuild: &jhbuild
-  artifacts:
-    name: log_jhbuild
-    when: always
-    paths: *JHB_files
-
 .coverage: &coverage
   artifacts:
     name: log_coverage
diff --git a/test/ci-images.sh b/test/ci-images.sh
index 966c3cbb..a60dc8c2 100755
--- a/test/ci-images.sh
+++ b/test/ci-images.sh
@@ -8,7 +8,6 @@ function do_Set_Env(){
     mkdir -p /on-host/.cache
     export XDG_CACHE_HOME=/on-host/.cache
 
-    export JHBUILD_RUN_AS_ROOT=1
     export SHELL=/bin/bash
     PATH=$PATH:~/.local/bin
 
diff --git a/test/extra/do_basic.sh b/test/extra/do_basic.sh
index 26411abf..65b74160 100755
--- a/test/extra/do_basic.sh
+++ b/test/extra/do_basic.sh
@@ -9,7 +9,7 @@ function do_Install_Dependencies(){
     # Base dependencies
     dnf -y    install @c-development @development-tools clang redhat-rpm-config gnome-common python-devel \
                       pygobject2 dbus-python perl-Text-CSV perl-XML-Parser gettext-devel gtk-doc \
-                      meson ninja-build zlib-devel libffi-devel \
+                      autoconf-archive meson ninja-build zlib-devel libffi-devel \
                       libtool libicu-devel nspr-devel systemtap-sdt-devel \
                       gtk3 gtk3-devel gobject-introspection-devel Xvfb gnome-desktop-testing dbus-x11 \
                       cairo intltool libxslt bison nspr python3-devel dbus-glib libicu \
diff --git a/test/extra/do_docker.sh b/test/extra/do_docker.sh
index 184bc6b0..b92c9899 100755
--- a/test/extra/do_docker.sh
+++ b/test/extra/do_docker.sh
@@ -16,13 +16,7 @@ if [[ $1 == "BUILD_MOZ" ]]; then
     do_Install_Dependencies
     do_Set_Env
     do_Show_Info
-    do_Get_JHBuild
-    do_Build_JHBuild
     do_Build_Mozilla
-
-    # Build JHBuild to create a docker image ready to go
-    jhbuild build m4-common
-
     do_Shrink_Image
 fi
 # Clear the environment
diff --git a/test/extra/do_environment.sh b/test/extra/do_environment.sh
index 957b6ff3..ed7c305e 100755
--- a/test/extra/do_environment.sh
+++ b/test/extra/do_environment.sh
@@ -1,38 +1,8 @@
 #!/bin/bash -e
 
-function do_Get_JHBuild(){
-    do_Print_Labels 'Download JHBuild'
-
-    if [[ -d /jhbuild ]]; then
-        # For a clean build, update and rebuild jhbuild. And avoid git pull.
-        rm -rf /jhbuild
-    fi
-    git clone --depth 1 https://github.com/GNOME/jhbuild.git /jhbuild
-
-    # A patch is no longer required
-    cd /jhbuild
-
-    echo '-- Done --'
-    cd -
-}
-
-function do_Configure_JHBuild(){
-    do_Print_Labels 'Set JHBuild Configuration'
-
-    mkdir -p ~/.config
-
-    cat <<EOFILE > ~/.config/jhbuildrc
-skip = ['gettext', 'yelp-xsl', 'yelp-tools', 'gtk-doc']
-use_local_modulesets = True
-EOFILE
-
-    echo '-- Done --'
-}
-
 function do_Configure_MainBuild(){
-    do_Print_Labels 'Set Main JHBuild Configuration'
+    do_Print_Labels 'Set Main Build Configuration'
 
-    mkdir -p ~/.config
     autogenargs="--enable-compile-warnings=yes"
 
     if [[ -n "${BUILD_OPTS}" ]]; then
@@ -40,42 +10,7 @@ function do_Configure_MainBuild(){
     fi
     export ci_autogenargs="$autogenargs"
 
-    cat <<EOFILE > ~/.config/jhbuildrc
-module_autogenargs['gjs'] = "$autogenargs"
-module_makeargs['gjs'] = '-s -j 1'
-skip = ['gettext', 'yelp-xsl', 'yelp-tools', 'gtk-doc']
-use_local_modulesets = True
-disable_Werror = False
-EOFILE
-
-    echo '-- Done --'
-}
-
-function do_Build_Package_Dependencies(){
-    do_Print_Labels "Building Dependencies for $1"
-    jhbuild list "$1"
-
-    # Build package dependencies
-    jhbuild build $(jhbuild list "$1" | sed '$d')
-}
-
-function do_Build_JHBuild(){
-    do_Print_Labels 'Building JHBuild'
-
-    # Build JHBuild
-    cd /jhbuild
-    git log --pretty=format:"%h %cd %s" -1
-    echo
-    ./autogen.sh PYTHON=$(which python2)
-    make -sj2
-    make install
-    PATH=$PATH:~/.local/bin
-
-    if [[ $1 == "RESET" ]]; then
-        git reset --hard HEAD
-    fi
     echo '-- Done --'
-    cd -
 }
 
 function do_Print_Labels(){
diff --git a/test/extra/do_mozilla.sh b/test/extra/do_mozilla.sh
index 18b2c694..f3b768d4 100755
--- a/test/extra/do_mozilla.sh
+++ b/test/extra/do_mozilla.sh
@@ -1,35 +1,5 @@
 #!/bin/bash -e
 
-function do_Configure_MozBuild(){
-    echo
-    echo '-- Set JHBuild Configuration --'
-
-    mkdir -p ~/.config
-    autogenargs=""
-
-    if [[ -n "${BUILD_OPTS}" ]]; then
-        autogenargs="$autogenargs $BUILD_OPTS"
-    fi
-
-    cat <<EOFILE >> ~/.config/jhbuildrc
-module_autogenargs['mozjs60'] = "$autogenargs"
-module_makeargs['mozjs60'] = '-s'
-EOFILE
-
-    echo '-- Done --'
-}
-
-function do_Build_Mozilla_jhbuild(){
-    echo
-    echo '-- Building Mozilla SpiderMonkey --'
-
-    # Configure the Mozilla build
-    do_Configure_MozBuild
-
-    # Build Mozilla Stuff
-    jhbuild build mozjs60
-}
-
 function do_Build_Mozilla(){
     echo
     echo '-- Building Mozilla SpiderMonkey --'
diff --git a/test/test-ci.sh b/test/test-ci.sh
index f3913e84..1189f35f 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -141,15 +141,6 @@ if [[ $1 == "GJS" ]]; then
     do_Set_Env
     do_Show_Info
 
-    if [[ "$DEV" == "jhbuild" ]]; then
-        do_Get_JHBuild
-        do_Build_JHBuild
-        do_Configure_JHBuild
-        do_Build_Package_Dependencies gjs
-
-    else
-        mkdir -p ~/jhbuild/checkout/gjs
-    fi
     do_Configure_MainBuild
 
     # Build and test the latest commit (merged or from a merge/pull request) of
@@ -159,27 +150,20 @@ if [[ $1 == "GJS" ]]; then
 
     do_Print_Labels 'Do the GJS build'
 
-    if [[ "$DEV" == "jhbuild" ]]; then
-        cp -r ./ ~/jhbuild/checkout/gjs
-        cd ~/jhbuild/checkout/gjs
+    export AM_DISTCHECK_CONFIGURE_FLAGS="--enable-compile-warnings=yes"
 
-        jhbuild make --check
-    else
-        export AM_DISTCHECK_CONFIGURE_FLAGS="--enable-compile-warnings=yes"
+    # Regular (autotools only) build
+    echo "Autogen options: $ci_autogenargs"
+    eval ./autogen.sh "$ci_autogenargs"
 
-        # Regular (autotools only) build
-        echo "Autogen options: $ci_autogenargs"
-        eval ./autogen.sh "$ci_autogenargs"
+    make -sj 2>&1 | tee compilation.log
 
-        make -sj 2>&1 | tee compilation.log
-
-        if [[ $TEST == "distcheck" ]]; then
-            xvfb-run -a make -s distcheck
-        elif [[ $TEST == "check" ]]; then
-            xvfb-run -a make -s check
-        fi
-        make -sj install
+    if [[ $TEST == "distcheck" ]]; then
+        xvfb-run -a make -s distcheck
+    elif [[ $TEST == "check" ]]; then
+        xvfb-run -a make -s check
     fi
+    make -sj install
 
     if [[ $WARNINGS == "count" ]]; then
         do_Print_Labels 'Warnings Report '
@@ -192,11 +176,7 @@ elif [[ $1 == "GJS_EXTRA" ]]; then
     do_Print_Labels 'Run GJS installed tests'
     do_Set_Env
 
-    if [[ "$DEV" == "jhbuild" ]]; then
-        xvfb-run -a jhbuild run dbus-run-session -- gnome-desktop-testing-runner gjs
-    else
-        xvfb-run -a dbus-run-session -- gnome-desktop-testing-runner gjs
-    fi
+    xvfb-run -a dbus-run-session -- gnome-desktop-testing-runner gjs
 
 elif [[ $1 == "VALGRIND" ]]; then
     # It doesn't (re)build, just run the 'Valgrind Tests'