GNOME.org
 

[gjs: 5/15] CI: Remove separate Ubuntu jobs

commit 9b100fa9554c3eb4fd18cd4b63fbc3e250d1414f
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Sep 7 18:23:13 2019 -0700

    CI: Remove separate Ubuntu jobs
    
    In practice these haven't been showing up any failures that weren't
    already flagged on the other jobs, so there's little need to have
    separate Docker images and separate jobs, with twice the maintenance
    load.
    
    Fedora Rawhide seems to carry the newer versions of dependencies fairly
    quickly (we couldn't build the new profiler code on Ubuntu recently, for
    example)
    
    Ideally we wouldn't depend on any downstream distribution at all, but
    until there is a pure GNOME Docker image we'll use Fedora Rawhide.

 .gitlab-ci.yml          | 46 +++-----------------------------
 test/ci-images.sh       |  2 +-
 test/extra/do_basic.sh  | 70 ++++++++++++++++---------------------------------
 test/extra/do_docker.sh | 10 ++-----
 4 files changed, 29 insertions(+), 99 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45f23e9b..ea9f72e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -248,7 +248,7 @@ coverage:
   <<: *build
   <<: *coverage
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "coverage"
     BUILD_OPTS: "--enable-code-coverage"
@@ -260,9 +260,9 @@ coverage:
 sanitizer_clang:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
-    TASK_ID: "ubuntu-x86_64-clang_ubsan_asan-default-default-check"
+    TASK_ID: "fedora-x86_64-clang_ubsan_asan-default-default-check"
     CC: clang
     BUILD_OPTS: "--enable-asan --enable-ubsan"
     TEST: "check"
@@ -292,30 +292,6 @@ installed_tests:
   except:
     - schedules
 
-# Planned as weekly
-ubuntu_gcc:
-  <<: *build
-  stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
-  variables:
-    TASK_ID: "ubuntu-x86_64-gcc-default-default-distcheck"
-    TEST: "distcheck"
-  when: manual
-  except:
-    - schedules
-
-ubuntu_clang:
-  <<: *build
-  stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
-  variables:
-    TASK_ID: "ubuntu-x86_64-clang-default-default-distcheck"
-    CC: clang
-    TEST: "distcheck"
-  when: manual
-  except:
-    - schedules
-
 valgrind:
   <<: *build
   stage: manual
@@ -399,7 +375,7 @@ zeal_11:
     - |
       if [[ -n "${IMAGE}" ]]; then
         docker run --name $NAME -v $(pwd):/on-host \
-          -e BASE=$BASE -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 DEV=$DEV -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
@@ -421,7 +397,6 @@ zeal_11:
 fedora.static-analysis:
   <<: *create_docker_image
   variables:
-    BASE: "fedora"
     DOCKER_DRIVER: overlay
     # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
     DOCKER_TLS_CERTDIR: ""
@@ -431,7 +406,6 @@ fedora.static-analysis:
 SM60-gcc.fedora-dev:
   <<: *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
@@ -442,7 +416,6 @@ SM60-gcc.fedora-dev:
 SM60-debug-gcc.fedora-dev:
   <<: *create_docker_image
   variables:
-    BASE: "fedora"
     BUILD_OPTS: "--enable-debug"
     DEV: "devel"
     DOCKER_DRIVER: overlay
@@ -450,14 +423,3 @@ SM60-debug-gcc.fedora-dev:
     DOCKER_TLS_CERTDIR: ""
     IMAGE: "fedora:rawhide"
     NAME: "SM60-debug-gcc.fedora-dev"
-
-SM60-gcc.ubuntu-dev:
-  <<: *create_docker_image
-  variables:
-    BASE: "debian"
-    DEV: "devel"
-    DOCKER_DRIVER: overlay
-    # https://about.gitlab.com/2019/07/31/docker-in-docker-with-docker-19-dot-03
-    DOCKER_TLS_CERTDIR: ""
-    IMAGE: "ubuntu:devel"
-    NAME: "SM60-gcc.ubuntu-dev"
diff --git a/test/ci-images.sh b/test/ci-images.sh
index 6c685e8a..edc05ad2 100755
--- a/test/ci-images.sh
+++ b/test/ci-images.sh
@@ -34,7 +34,7 @@ source test/extra/do_environment.sh
 
 # Show some environment info
 do_Print_Labels  'ENVIRONMENT'
-echo "Running on: $BASE $OS"
+echo "Running on: $OS"
 echo "Doing: $1 $extra_opts"
 
 source test/extra/do_basic.sh
diff --git a/test/extra/do_basic.sh b/test/extra/do_basic.sh
index 72af6483..b0f3e03d 100755
--- a/test/extra/do_basic.sh
+++ b/test/extra/do_basic.sh
@@ -4,43 +4,23 @@ function do_Install_Dependencies(){
     echo
     echo '-- Installing Base Dependencies --'
 
-    if [[ $BASE == "debian" ]]; then
-        apt-get update
-
-        # Base dependencies
-        apt-get -y     install build-essential git clang patch bison flex \
-                               meson ninja-build python-dev python3-dev \
-                               autotools-dev autoconf gettext pkgconf autopoint yelp-tools \
-                               docbook docbook-xsl libtext-csv-perl \
-                               zlib1g-dev libdbus-glib-1-dev \
-                               libtool libicu-dev libnspr4-dev \
-                               policykit-1 python3-setuptools \
-                               libgtk-3-dev gir1.2-gtk-3.0 xvfb gnome-desktop-testing dbus-x11 dbus \
-                               libedit-dev libgl1-mesa-dev lcov libreadline-dev
-
-    elif [[ $BASE == "fedora" ]]; then
-        dnf -y upgrade --best --allowerasing
-
-        # 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 \
-                          libtool libicu-devel nspr-devel systemtap-sdt-devel \
-                          gtk3 gtk3-devel gobject-introspection 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
-    else
-        echo
-        echo '-- Error: invalid BASE code --'
-        exit 1
+    dnf -y upgrade --best --allowerasing
+
+    # 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 \
+                      libtool libicu-devel nspr-devel systemtap-sdt-devel \
+                      gtk3 gtk3-devel gobject-introspection 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
 }
 
@@ -48,16 +28,10 @@ function do_Install_Extras(){
     echo
     echo '-- Installing Extra Dependencies --'
 
-    if [[ $BASE == "debian" ]]; then
-        # Distros development versions of needed libraries
-        apt-get -y install libgirepository1.0-dev libwebkit2gtk-4.0-dev notify-osd
-
-    elif [[ $BASE == "fedora" ]]; then
-        # Distros development versions of needed libraries
-        dnf -y install gobject-introspection-devel
+    # Distros development versions of needed libraries
+    dnf -y install gobject-introspection-devel
 
-        # 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
 }
diff --git a/test/extra/do_docker.sh b/test/extra/do_docker.sh
index 3930e3c9..5c0d644e 100755
--- a/test/extra/do_docker.sh
+++ b/test/extra/do_docker.sh
@@ -6,14 +6,8 @@ function do_Shrink_Image(){
     PATH=$PATH:~/.local/bin
     rm -rf ~/jhbuild/install/lib/libjs_static.ajs
 
-    if [[ $BASE == "ubuntu" ]]; then
-        apt-get -y clean
-        rm -rf /var/lib/apt/lists/*
-
-    elif [[ $BASE == "fedora" ]]; then
-        dnf -y clean all
-        rm -rf /var/cache/dnf
-    fi
+    dnf -y clean all
+    rm -rf /var/cache/dnf
 
     echo '-- Done --'
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]