ci: Move (most) deb9 jobs to deb10

deb9 is now end-of-life so we are dropping support for producing
bindists.

1 files changed, 57 insertions, 85 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e2bb4d3a1..d6c3099889 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -297,10 +297,10 @@ lint-release-changelogs:
 
 .validate-linux-hadrian:
   extends: .validate-hadrian
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   variables:
-    TEST_ENV: "x86_64-linux-deb9-hadrian"
-    BIN_DIST_NAME: "ghc-x86_64-deb9-linux"
+    TEST_ENV: "x86_64-linux-deb10-hadrian"
+    BIN_DIST_NAME: "ghc-x86_64-deb10-linux"
   before_script:
     # workaround for docker permissions
     - sudo chown ghc:ghc -R .
@@ -326,32 +326,32 @@ stack-hadrian-build:
     - .gitlab/ci.sh configure
     - hadrian/build-stack --version
 
-validate-x86_64-linux-deb9-hadrian:
+validate-x86_64-linux-deb10-hadrian:
   extends: .validate-linux-hadrian
   stage: full-build
   rules:
     - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
 
-validate-x86_64-linux-deb9-unreg-hadrian:
+validate-x86_64-linux-deb10-unreg-hadrian:
   extends: .validate-linux-hadrian
   stage: full-build
   variables:
     CONFIGURE_ARGS: --enable-unregisterised
-    TEST_ENV: "x86_64-linux-deb9-unreg-hadrian"
+    TEST_ENV: "x86_64-linux-deb10-unreg-hadrian"
 
-validate-x86_64-linux-deb9-no_tntc-hadrian:
+validate-x86_64-linux-deb10-no_tntc-hadrian:
   extends: .validate-linux-hadrian
   stage: full-build
   when: manual
   variables:
     CONFIGURE_ARGS: --disable-tables-next-to-code
-    TEST_ENV: "x86_64-linux-deb9-no_tntc-hadrian"
+    TEST_ENV: "x86_64-linux-deb10-no_tntc-hadrian"
 
 .build-x86_64-linux-deb10-hadrian-cross-aarch64:
   extends: .validate-linux-hadrian
   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   variables:
-    BIN_DIST_NAME: "ghc-x86_64-deb9-linux"
+    BIN_DIST_NAME: "ghc-x86_64-deb10-linux"
     CONFIGURE_ARGS: --with-intree-gmp
     CROSS_TARGET: "aarch64-linux-gnu"
 
@@ -374,7 +374,7 @@ nightly-x86_64-linux-deb10-hadrian-cross-aarch64:
 hadrian-ghc-in-ghci:
   stage: quick-build
   needs: [lint-linters, lint-submods]
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   before_script:
     # workaround for docker permissions
     - sudo chown ghc:ghc -R .
@@ -405,7 +405,7 @@ hadrian-ghc-in-ghci:
 
 .lint-params:
   needs: [lint-submods]
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   extends: .lint
   before_script:
     - export PATH="/opt/toolchain/bin:$PATH"
@@ -802,41 +802,41 @@ nightly-i386-linux-deb9:
     TEST_TYPE: slowtest
 
 #################################
-# x86_64-linux-deb9
+# x86_64-linux-deb10
 #################################
 
-.build-x86_64-linux-deb9:
+.build-x86_64-linux-deb10:
   extends: .validate-linux
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   variables:
-    TEST_ENV: "x86_64-linux-deb9"
-    BIN_DIST_PREP_TAR_COMP: "./ghc-x86_64-deb9-linux.tar.xz"
+    TEST_ENV: "x86_64-linux-deb10"
+    BIN_DIST_PREP_TAR_COMP: "./ghc-x86_64-deb10-linux.tar.xz"
   cache:
-    key: linux-x86_64-deb9-$CACHE_REV
+    key: linux-x86_64-deb10-$CACHE_REV
 
 # Disabled to reduce CI load
-.validate-x86_64-linux-deb9:
-  extends: .build-x86_64-linux-deb9
+.validate-x86_64-linux-deb10:
+  extends: .build-x86_64-linux-deb10
   stage: full-build
   artifacts:
     when: always
     expire_in: 2 week
 
-release-x86_64-linux-deb9:
+release-x86_64-linux-deb10:
   <<: *release
-  extends: .build-x86_64-linux-deb9
+  extends: .build-x86_64-linux-deb10
   stage: full-build
 
-nightly-x86_64-linux-deb9:
+nightly-x86_64-linux-deb10:
   <<: *nightly
-  extends: .build-x86_64-linux-deb9
+  extends: .build-x86_64-linux-deb10
   stage: full-build
   variables:
     TEST_TYPE: slowtest
 
 # N.B. Has DEBUG assertions enabled in stage2
-validate-x86_64-linux-deb9-debug:
-  extends: .build-x86_64-linux-deb9
+validate-x86_64-linux-deb10-debug:
+  extends: .build-x86_64-linux-deb10
   stage: full-build
   variables:
     BUILD_FLAVOUR: validate
@@ -845,95 +845,67 @@ validate-x86_64-linux-deb9-debug:
     # Override validate flavour default; see #16890.
     BUILD_SPHINX_PDF: "YES"
     TEST_TYPE: slowtest
-    TEST_ENV: "x86_64-linux-deb9-debug"
-    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb9-linux-debug.tar.xz"
+    TEST_ENV: "x86_64-linux-deb10-debug"
+    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux-debug.tar.xz"
     HADDOCK_HYPERLINKED_SOURCES: "yes"
   artifacts:
     when: always
     expire_in: 2 week
 
-validate-x86_64-linux-deb9-integer-simple:
-  extends: .build-x86_64-linux-deb9
+validate-x86_64-linux-deb10-integer-simple:
+  extends: .build-x86_64-linux-deb10
   stage: full-build
   variables:
     BUILD_FLAVOUR: validate
     BIGNUM_BACKEND: native
-    TEST_ENV: "x86_64-linux-deb9-integer-simple-validate"
-    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb9-linux-integer-simple.tar.xz"
+    TEST_ENV: "x86_64-linux-deb10-integer-simple-validate"
+    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux-integer-simple.tar.xz"
   rules:
     - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
 
-nightly-x86_64-linux-deb9-integer-simple:
+nightly-x86_64-linux-deb10-integer-simple:
   <<: *nightly
-  extends: .build-x86_64-linux-deb9
+  extends: .build-x86_64-linux-deb10
   stage: full-build
   variables:
     BIGNUM_BACKEND: native
-    TEST_ENV: "x86_64-linux-deb9-integer-simple"
+    TEST_ENV: "x86_64-linux-deb10-integer-simple"
     TEST_TYPE: slowtest
 
-.build-x86_64-linux-deb9-tsan:
+.build-x86_64-linux-deb10-tsan:
   extends: .validate-linux-hadrian
   stage: full-build
   variables:
-    TEST_ENV: "x86_64-linux-deb9-tsan"
+    TEST_ENV: "x86_64-linux-deb10-tsan"
     BUILD_FLAVOUR: "default+thread_sanitizer"
     TSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/rts/.tsan-suppressions"
     # Haddock is large enough to make TSAN choke without massive quantities of
     # memory.
     HADRIAN_ARGS: "--docs=none"
 
-nightly-x86_64-linux-deb9-tsan:
+nightly-x86_64-linux-deb10-tsan:
   <<: *nightly
-  extends: .build-x86_64-linux-deb9-tsan
+  extends: .build-x86_64-linux-deb10-tsan
 
-validate-x86_64-linux-deb9-tsan:
-  extends: .build-x86_64-linux-deb9-tsan
+validate-x86_64-linux-deb10-tsan:
+  extends: .build-x86_64-linux-deb10-tsan
   when: manual
 
-validate-x86_64-linux-deb9-dwarf:
-  extends: .build-x86_64-linux-deb9
+validate-x86_64-linux-deb10-dwarf:
+  extends: .build-x86_64-linux-deb10
   stage: full-build
   variables:
     CONFIGURE_ARGS: "--enable-dwarf-unwind"
     BUILD_FLAVOUR: dwarf
-    TEST_ENV: "x86_64-linux-deb9-dwarf"
-    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb9-linux-dwarf.tar.xz"
+    TEST_ENV: "x86_64-linux-deb10-dwarf"
+    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux-dwarf.tar.xz"
   rules:
     - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
 
-#################################
-# x86_64-linux-deb10
-#################################
-
-.build-x86_64-linux-deb10:
-  extends: .validate-linux
-  stage: full-build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
-  variables:
-    TEST_ENV: "x86_64-linux-deb10"
-    BIN_DIST_PREP_TAR_COMP: "./ghc-x86_64-deb10-linux.tar.xz"
-  cache:
-    key: linux-x86_64-deb10-$CACHE_REV
-
-# Disabled to alleviate CI load
-.validate-x86_64-linux-deb10:
-  extends: .build-x86_64-linux-deb10
-  stage: full-build
-
-nightly-x86_64-linux-deb10:
-  <<: *nightly
-  extends: .build-x86_64-linux-deb10
-  variables:
-    TEST_TYPE: slowtest
-
-release-x86_64-linux-deb10:
-  <<: *release
-  extends: .build-x86_64-linux-deb10
-
 release-x86_64-linux-deb10-dwarf:
   <<: *release
   extends: .build-x86_64-linux-deb10
+  stage: full-build
   variables:
     CONFIGURE_ARGS: "--enable-dwarf-unwind"
     BUILD_FLAVOUR: dwarf
@@ -1237,15 +1209,15 @@ release-x86_64-windows-integer-simple:
 
 doc-tarball:
   stage: packaging
-  needs: [validate-x86_64-linux-deb9-debug, validate-x86_64-windows-hadrian, validate-x86_64-linux-deb9-unreg-hadrian]
+  needs: [validate-x86_64-linux-deb10-debug, validate-x86_64-windows-hadrian, validate-x86_64-linux-deb10-unreg-hadrian]
   tags:
     - x86_64-linux
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   dependencies:
-    - validate-x86_64-linux-deb9-debug
+    - validate-x86_64-linux-deb10-debug
     - validate-x86_64-windows-hadrian
   variables:
-    LINUX_BINDIST: "ghc-x86_64-deb9-linux-debug.tar.xz"
+    LINUX_BINDIST: "ghc-x86_64-deb10-linux-debug.tar.xz"
     WINDOWS_BINDIST: "ghc-x86_64-unknown-mingw32.tar.xz"
   artifacts:
     paths:
@@ -1375,10 +1347,10 @@ perf-nofib:
   # Hence we allow this job to fail.
   allow_failure: true
   stage: testing
-  needs: [validate-x86_64-linux-deb9-dwarf, doc-tarball]
+  needs: [validate-x86_64-linux-deb10-dwarf, doc-tarball]
   dependencies:
-    - validate-x86_64-linux-deb9-dwarf
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
+    - validate-x86_64-linux-deb10-dwarf
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   rules:
     - if: $CI_MERGE_REQUEST_ID
     - if: '$CI_COMMIT_BRANCH == "master"'
@@ -1392,7 +1364,7 @@ perf-nofib:
     - root=$(pwd)/ghc
     - |
       mkdir tmp
-      tar -xf ../ghc-x86_64-deb9-linux-dwarf.tar.xz -C tmp
+      tar -xf ../ghc-x86_64-deb10-linux-dwarf.tar.xz -C tmp
       pushd tmp/ghc-*/
       ./configure --prefix=$root
       make install
@@ -1417,10 +1389,10 @@ perf-nofib:
 
 perf:
   stage: testing
-  needs: [validate-x86_64-linux-deb9-dwarf, doc-tarball]
+  needs: [validate-x86_64-linux-deb10-dwarf, doc-tarball]
   dependencies:
-    - validate-x86_64-linux-deb9-dwarf
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
+    - validate-x86_64-linux-deb10-dwarf
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   rules:
     - if: $CI_MERGE_REQUEST_ID
     - if: '$CI_COMMIT_BRANCH == "master"'
@@ -1431,7 +1403,7 @@ perf:
     - root=$(pwd)/ghc
     - |
       mkdir tmp
-      tar -xf ghc-x86_64-deb9-linux-dwarf.tar.xz -C tmp
+      tar -xf ghc-x86_64-deb10-linux-dwarf.tar.xz -C tmp
       pushd tmp/ghc-*/
       ./configure --prefix=$root
       make install