From 16be69910c643840871222179bee13d9f45b4c98 Mon Sep 17 00:00:00 2001
From: Alex Richert <alexander.richert@noaa.gov>
Date: Wed, 8 Feb 2023 15:33:47 -0800
Subject: [PATCH 1/5] Investigate RHEL CI failures

---
 .github/workflows/unit_tests.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
index b61a6bda2018d9..98d720e482532d 100644
--- a/.github/workflows/unit_tests.yaml
+++ b/.github/workflows/unit_tests.yaml
@@ -170,6 +170,15 @@ jobs:
       run: |
           source share/spack/setup-env.sh
           spack -d bootstrap now --dev
+          echo AJWR
+          mkdir -p /__w/spack/spack/opt/spack/gpg
+          echo whoami: $(whoami)
+          ls -ld /__w/spack
+          ls -ld /__w/spack/spack
+          ls -ld /__w/spack/spack/opt
+          ls -ld /__w/spack/spack/opt/spack
+          ls -ld /__w/spack/spack/opt/spack/gpg
+          echo AJWRend
           spack unit-test -k 'not cvs and not svn and not hg' -x --verbose
   # Test for the clingo based solver (using clingo-cffi)
   clingo-cffi:

From 8bd06f9d9600c5cffa9b341f7839df571d065a8c Mon Sep 17 00:00:00 2001
From: Alex Richert <alexander.richert@noaa.gov>
Date: Wed, 8 Feb 2023 15:43:35 -0800
Subject: [PATCH 2/5] More testing

---
 .github/workflows/unit_tests.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
index 98d720e482532d..f14b5e448fc84f 100644
--- a/.github/workflows/unit_tests.yaml
+++ b/.github/workflows/unit_tests.yaml
@@ -161,7 +161,9 @@ jobs:
           . .github/workflows/setup_git.sh
           useradd spack-test
           chown -R spack-test .
+          find -maxdepth 2 | xargs ls -ld
     - name: remove-extension
+      shell: runuser -u spack-test -- bash {0}
       run: |
           source share/spack/setup-env.sh
           spack config --scope=defaults rm "config:extensions"

From cf10aef5a95e9d981685f9c37cc8e2abe6ca7ccf Mon Sep 17 00:00:00 2001
From: Alex Richert <alexander.richert@noaa.gov>
Date: Wed, 8 Feb 2023 15:51:29 -0800
Subject: [PATCH 3/5] Narrow down issue...

---
 .github/workflows/unit_tests.yaml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
index f14b5e448fc84f..a9a39198f0cd95 100644
--- a/.github/workflows/unit_tests.yaml
+++ b/.github/workflows/unit_tests.yaml
@@ -161,26 +161,22 @@ jobs:
           . .github/workflows/setup_git.sh
           useradd spack-test
           chown -R spack-test .
-          find -maxdepth 2 | xargs ls -ld
     - name: remove-extension
       shell: runuser -u spack-test -- bash {0}
       run: |
+          echo AJWR1
+          ls -l /__w/spack/spack
           source share/spack/setup-env.sh
+          echo AJWR2
+          ls -l /__w/spack/spack
           spack config --scope=defaults rm "config:extensions"
+          echo AJWR3
+          ls -l /__w/spack/spack
     - name: Run unit tests
       shell: runuser -u spack-test -- bash {0}
       run: |
           source share/spack/setup-env.sh
           spack -d bootstrap now --dev
-          echo AJWR
-          mkdir -p /__w/spack/spack/opt/spack/gpg
-          echo whoami: $(whoami)
-          ls -ld /__w/spack
-          ls -ld /__w/spack/spack
-          ls -ld /__w/spack/spack/opt
-          ls -ld /__w/spack/spack/opt/spack
-          ls -ld /__w/spack/spack/opt/spack/gpg
-          echo AJWRend
           spack unit-test -k 'not cvs and not svn and not hg' -x --verbose
   # Test for the clingo based solver (using clingo-cffi)
   clingo-cffi:

From e206fc01e504cd5d685fa5362ef86169c177de36 Mon Sep 17 00:00:00 2001
From: Alex Richert <alexander.richert@noaa.gov>
Date: Wed, 8 Feb 2023 15:55:22 -0800
Subject: [PATCH 4/5] Narrow down issue...

---
 .github/workflows/unit_tests.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
index a9a39198f0cd95..1833f6d9d45187 100644
--- a/.github/workflows/unit_tests.yaml
+++ b/.github/workflows/unit_tests.yaml
@@ -162,7 +162,6 @@ jobs:
           useradd spack-test
           chown -R spack-test .
     - name: remove-extension
-      shell: runuser -u spack-test -- bash {0}
       run: |
           echo AJWR1
           ls -l /__w/spack/spack

From 5e5bcba858b147fe3e83da1565ec03c49157e136 Mon Sep 17 00:00:00 2001
From: Alex Richert <alexander.richert@noaa.gov>
Date: Wed, 8 Feb 2023 16:02:54 -0800
Subject: [PATCH 5/5] Fix RHEL unit tests by running setup-env.sh as user
 spack-test

---
 .github/workflows/unit_tests.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
index 1833f6d9d45187..d15d9000139f69 100644
--- a/.github/workflows/unit_tests.yaml
+++ b/.github/workflows/unit_tests.yaml
@@ -162,15 +162,10 @@ jobs:
           useradd spack-test
           chown -R spack-test .
     - name: remove-extension
+      shell: runuser -u spack-test -- bash {0}
       run: |
-          echo AJWR1
-          ls -l /__w/spack/spack
           source share/spack/setup-env.sh
-          echo AJWR2
-          ls -l /__w/spack/spack
           spack config --scope=defaults rm "config:extensions"
-          echo AJWR3
-          ls -l /__w/spack/spack
     - name: Run unit tests
       shell: runuser -u spack-test -- bash {0}
       run: |