[gjs: 2/8] CI: Use "mozjs" consistently

[Philip Chimento <pchimento src gnome org>]

commit ef24de1d803dfa8f82a7ab9ea989b5533e9ba843
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Sep 11 22:06:24 2019 -0700

    CI: Use "mozjs" consistently
    
    We use "mozjs" everywhere else, so to remove any confusion about the
    "SM" and "spider" abbreviations, rename the Docker images and the mozjs
    build directory.

 .gitlab-ci.yml           | 10 ++++------
 test/extra/do_mozilla.sh |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b2ed634..b21588f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -417,19 +417,18 @@ alpine.cpplint:
     variables:
       - $CI_COMMIT_MESSAGE =~ /\[skip images\]/ && $CI_COMMIT_MESSAGE =~ /alpine.cpplint/
 
-SM60-gcc.fedora-dev:
+fedora.mozjs60:
   <<: *create_docker_image
   variables:
     DOCKER_DRIVER: overlay
     # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
     DOCKER_TLS_CERTDIR: ""
     IMAGE: "fedora:rawhide"
-    NAME: "SM60-gcc.fedora-dev"
   except:
     variables:
-      - $CI_COMMIT_MESSAGE =~ /\[skip images\]/ && $CI_COMMIT_MESSAGE =~ /SM60-gcc.fedora-dev/
+      - $CI_COMMIT_MESSAGE =~ /\[skip images\]/ && $CI_COMMIT_MESSAGE =~ /fedora.mozjs60/
 
-SM60-debug-gcc.fedora-dev:
+fedora.mozjs60-debug:
   <<: *create_docker_image
   variables:
     BUILD_OPTS: "--enable-debug"
@@ -437,7 +436,6 @@ SM60-debug-gcc.fedora-dev:
     # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
     DOCKER_TLS_CERTDIR: ""
     IMAGE: "fedora:rawhide"
-    NAME: "SM60-debug-gcc.fedora-dev"
   except:
     variables:
-      - $CI_COMMIT_MESSAGE =~ /\[skip images\]/ && $CI_COMMIT_MESSAGE =~ /SM60-debug-gcc.fedora-dev/
+      - $CI_COMMIT_MESSAGE =~ /\[skip images\]/ && $CI_COMMIT_MESSAGE =~ /fedora.mozjs60-debug/
diff --git a/test/extra/do_mozilla.sh b/test/extra/do_mozilla.sh
index f3b768d4..13131ea2 100755
--- a/test/extra/do_mozilla.sh
+++ b/test/extra/do_mozilla.sh
@@ -4,8 +4,8 @@ function do_Build_Mozilla(){
     echo
     echo '-- Building Mozilla SpiderMonkey --'
 
-    git clone --depth 1 https://github.com/ptomato/mozjs.git -b "${MOZJS_BRANCH:-mozjs60}" /on-host/spider
-    cd /on-host/spider
+    git clone --depth 1 https://github.com/ptomato/mozjs.git -b "${MOZJS_BRANCH:-mozjs60}" /on-host/mozjs
+    cd /on-host/mozjs
 
     mkdir -p _build
     cd _build