CI: Update Data and Vis SDK Stack (#34009)

* CI: Update Data and Vis SDK Stack

* Update image to match target deployments (E4S)
* Enable all packages
* Test supported variants of ParaView and VisIt

* Sensei: Update Python hint for newer cmake

* Sensei: add Python3 hint

share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml

@@ -539,9 +539,11 @@ radiuss-aws-aarch64-protected-build:
 
 data-vis-sdk-pr-generate:
   extends: [ ".data-vis-sdk", ".pr-generate"]
+  image: ecpe4s/ubuntu20.04-runner-x86_64:2022-10-01
 
 data-vis-sdk-protected-generate:
   extends: [ ".data-vis-sdk", ".protected-generate"]
+  image: ecpe4s/ubuntu20.04-runner-x86_64:2022-10-01
 
 data-vis-sdk-pr-build:
   extends: [ ".data-vis-sdk", ".pr-build" ]

share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml

@@ -17,36 +17,63 @@ spack:
     cmake:
       variants: ~ownlibs
     mesa:
-      variants: +glx ~osmesa +opengl ~opengles +llvm
-    paraview:
-      variants: +qt
-    visit:
-      variants: +gui
+      require: "@21 +glx +osmesa +opengl ~opengles +llvm swr=auto"
+    libosmesa:
+      require: ^mesa +osmesa
+    libglx:
+      require: ^mesa +glx
     all:
       target: [x86_64]
 
-  # Currently disabled: sensei
-  specs:
-    - ecp-data-vis-sdk ~cuda ~rocm ~sensei
-        +adios2
+  definitions:
+  - paraview_specs:
+    - matrix:
+      - - paraview
+      - - +qt~osmesa # GUI Support w/ GLX Rendering
+        - ~qt~osmesa # GLX Rendering
+        - ~qt+osmesa # OSMesa Rendering
+  - visit_specs:
+    - matrix:
+      - - visit
+      - - +gui~osmesa # GUI Support w/ GLX Rendering
+        - ~gui~osmesa # GLX Rendering
+        - ~gui+osmesa # OSMesa Rendering
+  - sdk_base_spec:
+    - matrix:
+      - - ecp-data-vis-sdk
             +ascent
+            +adios2
             +cinema
             +darshan
             +faodel
             +hdf5
-        +paraview
             +pnetcdf
+            +sensei
             +sz
             +unifyfs
             +veloc
             +vtkm
             +zfp
-        +visit
+      - - ~cuda ~rocm
+        # Current testing of GPU supported configurations
+        # is provided in the E4S stack
+        # - +cuda ~rocm
+        # - ~cuda +rocm
+
+  specs:
+    # Test ParaView builds with different GL backends
+    - matrix:
+      - [$sdk_base_spec]
+      - [$^paraview_specs]
+    # Test ParaView builds with differnt GL backends
+    - matrix:
+      - [$sdk_base_spec]
+      - [$^visit_specs]
 
   mirrors: { "mirror": "s3://spack-binaries/develop/data-vis-sdk" }
 
   gitlab-ci:
-    image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] }
+    image: ecpe4s/ubuntu20.04-runner-x86_64:2022-10-01
     script:
       - uname -a || true
       - grep -E 'vendor|model name' /proc/cpuinfo 2>/dev/null | sort -u || head -n10 /proc/cpuinfo 2>/dev/null || true
@@ -71,6 +98,8 @@ spack:
       - match:
         - llvm
         - qt
+        - paraview
+        - visit
         runner-attributes:
           tags: [ "spack", "huge", "x86_64" ]
           variables:
@@ -82,8 +111,6 @@ spack:
         - ecp-data-vis-sdk
         - mesa
         - openblas
-            - paraview
-            - visit
         - vtk-m
         runner-attributes:
           tags: [ "spack", "large", "x86_64" ]
@@ -145,7 +172,6 @@ spack:
         - sqlite
         - tar
         - util-linux-uuid
-
         runner-attributes:
           tags: [ "spack", "small", "x86_64" ]
           variables:
@@ -162,7 +188,7 @@ spack:
     broken-specs-url: "s3://spack-binaries/broken-specs"
 
     service-job-attributes:
-      image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] }
+      image: ecpe4s/ubuntu20.04-runner-x86_64:2022-10-01
       before_script:
         - . "./share/spack/setup-env.sh"
         - spack --version

var/spack/repos/builtin/packages/sensei/package.py

@@ -139,6 +139,8 @@ def cmake_args(self):
 
         if "+python" in spec:
             args.append(self.define("PYTHON_EXECUTABLE", spec["python"].command.path))
+            args.append(self.define("Python_EXECUTABLE", spec["python"].command.path))
+            args.append(self.define("Python3_EXECUTABLE", spec["python"].command.path))
             if spec.satisfies("@3:"):
                 args.append(self.define("SENSEI_PYTHON_VERSION", 3))
             args.append(self.define_from_variant("ENABLE_CATALYST_PYTHON", "catalyst"))