setup-env.sh: if exe contains qemu, use /proc/$$/comm instead

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

@@ -703,48 +703,25 @@ ml-darwin-aarch64-mps-build:
 ########################################
 # High Energy Physics (HEP) - Linux x86_64 (CPU)
 ########################################
-.hep-x86_64_v3:
+.hep:
   extends: [ ".linux_x86_64_v3" ]
   variables:
-    SPACK_CI_STACK_NAME: hep-x86_64_v3
+    SPACK_CI_STACK_NAME: hep
 
-hep-x86_64_v3-generate:
-  extends: [ ".hep-x86_64_v3", ".generate-x86_64"]
+hep-generate:
+  extends: [ ".hep", ".generate-x86_64"]
   image: ghcr.io/spack/spack/ubuntu22.04-runner-amd64-gcc-11.4:2024.03.01
 
-hep-x86_64_v3-build:
-  extends: [ ".hep-x86_64_v3", ".build" ]
+hep-build:
+  extends: [ ".hep", ".build" ]
   trigger:
     include:
       - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-        job: hep-x86_64_v3-generate
+        job: hep-generate
     strategy: depend
   needs:
     - artifacts: True
-      job: hep-x86_64_v3-generate
-
-########################################
-# High Energy Physics (HEP) - Linux x86_64 (CPU)
-########################################
-.hep-darwin:
-  extends: [ ".darwin_aarch64" ]
-  variables:
-    SPACK_CI_STACK_NAME: hep-darwin
-
-hep-darwin-generate:
-  tags: [ "macos-sequoia", "apple-clang-16", "aarch64-macos" ]
-  extends: [ ".hep-darwin", ".generate-x86_64"]
-
-hep-darwin-build:
-  extends: [ ".hep-darwin", ".build" ]
-  trigger:
-    include:
-      - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-        job: hep-darwin-generate
-    strategy: depend
-  needs:
-    - artifacts: True
-      job: hep-darwin-generate
+      job: hep-generate
 
 ########################################
 # AWS ParallelCluster

share/spack/gitlab/cloud_pipelines/stacks/hep-darwin/spack.yaml

@@ -1,28 +0,0 @@
-spack:
-  view: false
-
-  concretizer:
-    reuse: false
-    unify: when_possible
-    static_analysis: true
-
-  packages:
-    all:
-      require:
-      - target=aarch64
-    root:
-      require: +arrow ~daos +davix ~dcache +emacs +examples +fftw +fits +fortran +gdml +graphviz +gsl +http +math +minuit +mlp +mysql +opengl +postgres +pythia8 +python +r +roofit +root7 +rpath ~shadow +spectrum +sqlite +ssl +tbb +threads +tmva +tmva-cpu +unuran +vc +vdt +veccore +webgui +x +xml +xrootd # cxxstd=20
-      # note: root cxxstd=20 not concretizable within sherpa
-
-  specs:
-  # CPU
-  - root ~cuda
-
-  ci:
-    pipeline-gen:
-    - build-job:
-        variables:
-          CI_GPG_KEY_ROOT: /etc/protected-runner
-
-  cdash:
-    build-group: HEP darwin

share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml

@@ -143,4 +143,4 @@ spack:
         image: ghcr.io/spack/spack/ubuntu22.04-runner-amd64-gcc-11.4:2024.03.01
 
   cdash:
-    build-group: HEP x86_64_v3
+    build-group: HEP

share/spack/setup-env.sh

@@ -232,6 +232,10 @@ _spack_determine_shell() {
         # If procfs is present this seems a more reliable
         # way to detect the current shell
         _sp_exe=$(readlink /proc/$$/exe)
+        # Qemu emulation has _sp_exe point to the emulator
+        if [ "${_sp_exe##*qemu*}" != "${_sp_exe}" ]; then
+            _sp_exe=$(cat /proc/$$/comm)
+        fi
         # Shell may contain number, like zsh5 instead of zsh
         basename ${_sp_exe} | tr -d '0123456789'
     elif [ -n "${BASH:-}" ]; then