From 2f6e30fd24dff554b4d6185a2ddd05e3bc94c108 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <me@harmenstoppels.nl>
Date: Mon, 16 Dec 2024 13:08:05 +0100
Subject: [PATCH] ci: new image for developer-tools (#48065)

---
 .../gitlab/cloud_pipelines/.gitlab-ci.yml     | 19 +++++++++----------
 .../spack.yaml                                | 19 ++-----------------
 2 files changed, 11 insertions(+), 27 deletions(-)
 rename share/spack/gitlab/cloud_pipelines/stacks/{developer-tools-manylinux2014 => developer-tools-x86_64_v3-linux-gnu}/spack.yaml (78%)

diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
index 95f98840f07..ce29513db41 100644
--- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
+++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
@@ -447,27 +447,26 @@ build_systems-build:
 
 ###########################################
 # Build tests for different developer tools
-# manylinux2014
 ###########################################
-.developer-tools-manylinux2014:
+.developer-tools-x86_64_v3-linux-gnu:
   extends: [ ".linux_x86_64_v3" ]
   variables:
-    SPACK_CI_STACK_NAME: developer-tools-manylinux2014
+    SPACK_CI_STACK_NAME: developer-tools-x86_64_v3-linux-gnu
 
-developer-tools-manylinux2014-generate:
-  extends: [ ".developer-tools-manylinux2014", ".generate-x86_64"]
-  image:  ghcr.io/spack/spack/manylinux2014:2024.03.28
+developer-tools-x86_64_v3-linux-gnu-generate:
+  extends: [ ".developer-tools-x86_64_v3-linux-gnu", ".generate-x86_64"]
+  image:  ghcr.io/spack/x86_64_v3-linux-gnu:2024-12-12
 
-developer-tools-manylinux2014-build:
-  extends: [ ".developer-tools-manylinux2014", ".build" ]
+developer-tools-x86_64_v3-linux-gnu-build:
+  extends: [ ".developer-tools-x86_64_v3-linux-gnu", ".build" ]
   trigger:
     include:
       - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-        job: developer-tools-manylinux2014-generate
+        job: developer-tools-x86_64_v3-linux-gnu-generate
     strategy: depend
   needs:
     - artifacts: True
-      job: developer-tools-manylinux2014-generate
+      job: developer-tools-x86_64_v3-linux-gnu-generate
 
 ###########################################
 # Build tests for different developer tools
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-manylinux2014/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-x86_64_v3-linux-gnu/spack.yaml
similarity index 78%
rename from share/spack/gitlab/cloud_pipelines/stacks/developer-tools-manylinux2014/spack.yaml
rename to share/spack/gitlab/cloud_pipelines/stacks/developer-tools-x86_64_v3-linux-gnu/spack.yaml
index e2a3c0bf5ec..b1b754daef1 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-manylinux2014/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/developer-tools-x86_64_v3-linux-gnu/spack.yaml
@@ -76,25 +76,10 @@ spack:
     - - $default_specs
     - - $arch
 
-  compilers:
-  - compiler:
-      spec: gcc@=10.2.1
-      paths:
-        cc: /opt/rh/devtoolset-10/root/usr/bin/gcc
-        cxx: /opt/rh/devtoolset-10/root/usr/bin/g++
-        f77: /opt/rh/devtoolset-10/root/usr/bin/gfortran
-        fc: /opt/rh/devtoolset-10/root/usr/bin/gfortran
-      flags: {}
-      operating_system: centos7
-      target: x86_64
-      modules: []
-      environment: {}
-      extra_rpaths: []
-
   ci:
     pipeline-gen:
     - build-job:
-        image: ghcr.io/spack/spack/manylinux2014:2024.03.28
+        image: ghcr.io/spack/x86_64_v3-linux-gnu:2024-12-12
 
   cdash:
-    build-group: Developer Tools Manylinux2014
+    build-group: Developer Tools x86_64_v3-linux-gnu