[gjs: 10/15] CI: Remove "DEV" variable from Docker image generation

[Philip Chimento <pchimento src gnome org>]

commit 4dd2b099b32a6decea962768d21f89c83ab1dbe1
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Sep 7 22:14:32 2019 -0700

    CI: Remove "DEV" variable from Docker image generation
    
    Since all the remaining images are "DEV: devel", we just make that the
    default.

 .gitlab-ci.yml          |  4 +---
 test/extra/do_basic.sh  | 16 ++--------------
 test/extra/do_docker.sh |  4 ----
 3 files changed, 3 insertions(+), 21 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 345abd9a..6f600d36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -375,7 +375,7 @@ zeal_11:
     - |
       if [[ -n "${IMAGE}" ]]; then
         docker run --name $NAME -v $(pwd):/on-host \
-          -e OS=$IMAGE -e BUILD_OPTS=$BUILD_OPTS -e DEV=$DEV -e CC=gcc -e STATIC=$STATIC $IMAGE \
+          -e OS=$IMAGE -e BUILD_OPTS=$BUILD_OPTS -e CC=gcc -e STATIC=$STATIC $IMAGE \
           bash -e -c "cd /on-host && test/ci-images.sh BUILD_MOZ"
         docker commit $NAME "$CI_REGISTRY_IMAGE:$NAME"
       fi
@@ -409,7 +409,6 @@ fedora.static-analysis:
 SM60-gcc.fedora-dev:
   <<: *create_docker_image
   variables:
-    DEV: "devel"
     DOCKER_DRIVER: overlay
     # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
     DOCKER_TLS_CERTDIR: ""
@@ -423,7 +422,6 @@ SM60-debug-gcc.fedora-dev:
   <<: *create_docker_image
   variables:
     BUILD_OPTS: "--enable-debug"
-    DEV: "devel"
     DOCKER_DRIVER: overlay
     # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
     DOCKER_TLS_CERTDIR: ""
diff --git a/test/extra/do_basic.sh b/test/extra/do_basic.sh
index b0f3e03d..26411abf 100755
--- a/test/extra/do_basic.sh
+++ b/test/extra/do_basic.sh
@@ -11,25 +11,13 @@ function do_Install_Dependencies(){
                       pygobject2 dbus-python perl-Text-CSV perl-XML-Parser gettext-devel gtk-doc \
                       meson ninja-build zlib-devel libffi-devel \
                       libtool libicu-devel nspr-devel systemtap-sdt-devel \
-                      gtk3 gtk3-devel gobject-introspection Xvfb gnome-desktop-testing dbus-x11 \
+                      gtk3 gtk3-devel gobject-introspection-devel Xvfb gnome-desktop-testing dbus-x11 \
                       cairo intltool libxslt bison nspr python3-devel dbus-glib libicu \
                       libxslt libtool flex \
                       cairo-devel zlib-devel libffi-devel pcre-devel libxml2-devel libxslt-devel \
                       libedit-devel libasan libubsan libtsan compiler-rt \
                       sysprof-devel lcov mesa-libGL-devel readline-devel \
-                      webkit2gtk3
-
-    if [[ $DEV == "devel" ]]; then
-        dnf -y install time
-    fi
-}
-
-function do_Install_Extras(){
-    echo
-    echo '-- Installing Extra Dependencies --'
-
-    # Distros development versions of needed libraries
-    dnf -y install gobject-introspection-devel
+                      webkit2gtk3 time
 
     # Distros debug info of needed libraries
     dnf -y debuginfo-install glib2-devel gobject-introspection-devel \
diff --git a/test/extra/do_docker.sh b/test/extra/do_docker.sh
index 5c0d644e..184bc6b0 100755
--- a/test/extra/do_docker.sh
+++ b/test/extra/do_docker.sh
@@ -15,10 +15,6 @@ function do_Shrink_Image(){
 if [[ $1 == "BUILD_MOZ" ]]; then
     do_Install_Dependencies
     do_Set_Env
-
-    if [[ $DEV == "devel" ]]; then
-        do_Install_Extras
-    fi
     do_Show_Info
     do_Get_JHBuild
     do_Build_JHBuild