From 7abec2351c40d7d56b695279a8c137103124f093 Mon Sep 17 00:00:00 2001
From: William Hobbs <hobbs17@llnl.gov>
Date: Tue, 18 Feb 2025 09:42:18 -0800
Subject: [PATCH 1/2] gitlab: serialize poodle testsuite

Problem: something is interrupting the testsuite on
Poodle with SIGKILL, but with 112 processes, it's difficult to
tell exactly what.

Make the testsuite run serially for now.
---
 .gitlab-ci.yml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9ddcad..836b6ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,23 @@ default:
         # Note: the above will not work with /usr/workspace, you must specify WS1 or WS2
 
 ## Job Specifications
+.test-core-poodle:
+    extends: .lc-variables
+    variables:
+        PYTHON: "/usr/bin/python3"
+        debug: t
+        FLUX_TESTS_LOGFILE: t
+    script:
+        - echo $CI_DIRECTORY
+        - cd ${CORE_BUILD_DIR}
+        - lstopo --of xml >$(hostname).xml
+        - export FLUX_HWLOC_XMLFILE=$(pwd)/$(hostname).xml
+        - make check
+        ## The following is teardown to make sure the xml file doesn't get reused
+        ## but maybe it's unnecessary. Subsequent tests will run under new shells...
+        - rm ${FLUX_HWLOC_XMLFILE}
+        - unset FLUX_HWLOC_XMLFILE
+
 .test-core:
     extends: .lc-variables
     variables:
@@ -136,7 +153,7 @@ poodle-core-build:
 poodle-core-test:
     needs: ["poodle-core-build"]
     extends: 
-        - .test-core
+        - .test-core-poodle
         - .poodle
     stage: test
 

From 895e6da29b2ca8c3a9078e453f31bad51eb85d1e Mon Sep 17 00:00:00 2001
From: William Hobbs <hobbs17@llnl.gov>
Date: Tue, 18 Feb 2025 09:42:57 -0800
Subject: [PATCH 2/2] gitlab: update bank information

Problem: we have access to higher priority banks on
tioga and poodle but are still running under the guests
bank.

Update bank information.
---
 .gitlab/machines.gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab/machines.gitlab-ci.yml b/.gitlab/machines.gitlab-ci.yml
index 810b9cb..e4deb80 100644
--- a/.gitlab/machines.gitlab-ci.yml
+++ b/.gitlab/machines.gitlab-ci.yml
@@ -21,12 +21,12 @@
         - poodle
         - batch
     variables:
-        LLNL_SLURM_SCHEDULER_PARAMETERS: "--exclusive -N 1 -p pdebug"
+        LLNL_SLURM_SCHEDULER_PARAMETERS: "--exclusive -A lc -N 1 -p pdebug"
 
 .tioga:
     tags:
         - tioga
         - batch
     variables:
-        LLNL_FLUX_SCHEDULER_PARAMETERS: "--exclusive -N 1 -q pci"
+        LLNL_FLUX_SCHEDULER_PARAMETERS: "--exclusive -N 1 -q pci --setattr=bank=lc"