From 517a44a8a5b4125ec89748846bf85e157cf2eaaf Mon Sep 17 00:00:00 2001
From: Alexey Shiklomanov <alexey.shiklomanov@gmail.com>
Date: Sat, 1 Jun 2024 10:38:13 -0400
Subject: [PATCH 1/4] Refactor GitHub actions into standalone scripts

---
 .../swell-tier1_application_discover.yml      | 84 +------------------
 scripts/install-swell.sh                      | 13 +++
 scripts/run-swell-3dvar.sh                    | 25 ++++++
 scripts/run-swell-hofx.sh                     | 25 ++++++
 scripts/run-swell-ufo_testing.sh              | 27 ++++++
 5 files changed, 94 insertions(+), 80 deletions(-)
 create mode 100644 scripts/install-swell.sh
 create mode 100644 scripts/run-swell-3dvar.sh
 create mode 100644 scripts/run-swell-hofx.sh
 create mode 100644 scripts/run-swell-ufo_testing.sh

diff --git a/.github/workflows/swell-tier1_application_discover.yml b/.github/workflows/swell-tier1_application_discover.yml
index dd3cdf9..8899a25 100644
--- a/.github/workflows/swell-tier1_application_discover.yml
+++ b/.github/workflows/swell-tier1_application_discover.yml
@@ -24,14 +24,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: install-swell
-        run: |
-          # Make experiment directory
-          mkdir /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
-          # Copy and source modules
-          cp ${GITHUB_WORKSPACE}/src/swell/deployment/platforms/nccs_discover/modules /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/
-          source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
-          pip install --prefix=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/swell -r ${GITHUB_WORKSPACE}/requirements.txt --no-cache-dir ${GITHUB_WORKSPACE}
-          # Remove source code (needed to ensure nothing relies on the source)
+        run: ./scripts/install-swell.sh
 
   # Run ufo_testing workflow
   # ------------------------
@@ -44,30 +37,7 @@ jobs:
     steps:
 
       - name: run-swell-ufo_testing
-        run: |
-          CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
-          SUITE_NAME=ufo_testing
-          CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
-          EXPERIMENT_ID=swell-${SUITE_NAME}-${GITHUB_RUN_ID}
-
-          mkdir -p $CI_WORKSPACE_JOB
-
-          source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
-
-          # Get python version
-          PYVER=`python --version | awk '{print $2}' | awk -F. '{print $1"."$2}'`
-
-          export PATH=$CI_WORKSPACE/swell/bin:$PATH
-          export PYTHONPATH=${PYTHONPATH}:$CI_WORKSPACE/swell/lib/python$PYVER/site-packages
-
-          echo "experiment_id: $EXPERIMENT_ID" > $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-          echo "experiment_root: $CI_WORKSPACE_JOB" >> $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-
-          rm -r -f $HOME/cylc-run/${EXPERIMENT_ID}-suite
-
-          cd $CI_WORKSPACE_JOB
-          swell create ${SUITE_NAME} -m defaults -p nccs_discover -o $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-          swell launch $CI_WORKSPACE_JOB/${EXPERIMENT_ID}/${EXPERIMENT_ID}-suite --no-detach --log_path $CI_WORKSPACE_JOB/${EXPERIMENT_ID}
+        run: ./scripts/run-swell-ufo_testing.sh
 
   # Move experiment directory on failure
   swell-tier_1-ufo_testing-failure:
@@ -96,30 +66,7 @@ jobs:
     steps:
 
       - name: run-swell-hofx
-        run: |
-          CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
-          SUITE_NAME=hofx
-          CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
-          EXPERIMENT_ID=swell-${SUITE_NAME}-${GITHUB_RUN_ID}
-
-          mkdir -p $CI_WORKSPACE_JOB
-
-          source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
-
-          # Get python version
-          PYVER=`python --version | awk '{print $2}' | awk -F. '{print $1"."$2}'`
-
-          export PATH=$CI_WORKSPACE/swell/bin:$PATH
-          export PYTHONPATH=${PYTHONPATH}:$CI_WORKSPACE/swell/lib/python$PYVER/site-packages
-
-          echo "experiment_id: $EXPERIMENT_ID" > $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-          echo "experiment_root: $CI_WORKSPACE_JOB" >> $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-
-          rm -r -f $HOME/cylc-run/${EXPERIMENT_ID}-suite
-
-          cd $CI_WORKSPACE_JOB
-          swell create ${SUITE_NAME} -m defaults -p nccs_discover -o $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-          swell launch $CI_WORKSPACE_JOB/${EXPERIMENT_ID}/${EXPERIMENT_ID}-suite --no-detach --log_path $CI_WORKSPACE_JOB/${EXPERIMENT_ID}
+        run: ./scripts/run-swell-hofx.sh
 
   # Move experiment directory on failure
   swell-tier_1-hofx-failure:
@@ -147,30 +94,7 @@ jobs:
     steps:
 
       - name: run-swell-3dvar
-        run: |
-          CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
-          SUITE_NAME=3dvar
-          CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
-          EXPERIMENT_ID=swell-${SUITE_NAME}-${GITHUB_RUN_ID}
-
-          mkdir -p $CI_WORKSPACE_JOB
-
-          source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
-
-          # Get python version
-          PYVER=`python --version | awk '{print $2}' | awk -F. '{print $1"."$2}'`
-
-          export PATH=$CI_WORKSPACE/swell/bin:$PATH
-          export PYTHONPATH=${PYTHONPATH}:$CI_WORKSPACE/swell/lib/python$PYVER/site-packages
-
-          echo "experiment_id: $EXPERIMENT_ID" > $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-          echo "experiment_root: $CI_WORKSPACE_JOB" >> $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-
-          rm -r -f $HOME/cylc-run/${EXPERIMENT_ID}-suite
-
-          cd $CI_WORKSPACE_JOB
-          swell create ${SUITE_NAME} -m defaults -p nccs_discover -o $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-          swell launch $CI_WORKSPACE_JOB/${EXPERIMENT_ID}/${EXPERIMENT_ID}-suite --no-detach --log_path $CI_WORKSPACE_JOB/${EXPERIMENT_ID}
+        run: ./scripts/run-swell-3dvar.sh
 
   # Move experiment directory on failure
   swell-tier_1-3dvar-failure:
diff --git a/scripts/install-swell.sh b/scripts/install-swell.sh
new file mode 100644
index 0000000..d3bb6a8
--- /dev/null
+++ b/scripts/install-swell.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+# Make experiment directory
+mkdir /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
+
+# Copy and source modules
+cp ${GITHUB_WORKSPACE}/src/swell/deployment/platforms/nccs_discover/modules /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/
+source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
+pip install --prefix=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/swell -r ${GITHUB_WORKSPACE}/requirements.txt --no-cache-dir ${GITHUB_WORKSPACE}
+
+# Remove source code (needed to ensure nothing relies on the source)
diff --git a/scripts/run-swell-3dvar.sh b/scripts/run-swell-3dvar.sh
new file mode 100644
index 0000000..10d7d2b
--- /dev/null
+++ b/scripts/run-swell-3dvar.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
+SUITE_NAME=3dvar
+CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
+EXPERIMENT_ID=swell-${SUITE_NAME}-${GITHUB_RUN_ID}
+
+mkdir -p $CI_WORKSPACE_JOB
+
+source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
+
+# Get python version
+PYVER=`python --version | awk '{print $2}' | awk -F. '{print $1"."$2}'`
+
+export PATH=$CI_WORKSPACE/swell/bin:$PATH
+export PYTHONPATH=${PYTHONPATH}:$CI_WORKSPACE/swell/lib/python$PYVER/site-packages
+
+echo "experiment_id: $EXPERIMENT_ID" > $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
+echo "experiment_root: $CI_WORKSPACE_JOB" >> $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
+
+rm -r -f $HOME/cylc-run/${EXPERIMENT_ID}-suite
+
+cd $CI_WORKSPACE_JOB
+swell create ${SUITE_NAME} -m defaults -p nccs_discover -o $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
+swell launch $CI_WORKSPACE_JOB/${EXPERIMENT_ID}/${EXPERIMENT_ID}-suite --no-detach --log_path $CI_WORKSPACE_JOB/${EXPERIMENT_ID}
diff --git a/scripts/run-swell-hofx.sh b/scripts/run-swell-hofx.sh
new file mode 100644
index 0000000..e37cc0f
--- /dev/null
+++ b/scripts/run-swell-hofx.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
+SUITE_NAME=hofx
+CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
+EXPERIMENT_ID=swell-${SUITE_NAME}-${GITHUB_RUN_ID}
+
+mkdir -p $CI_WORKSPACE_JOB
+
+source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
+
+# Get python version
+PYVER=`python --version | awk '{print $2}' | awk -F. '{print $1"."$2}'`
+
+export PATH=$CI_WORKSPACE/swell/bin:$PATH
+export PYTHONPATH=${PYTHONPATH}:$CI_WORKSPACE/swell/lib/python$PYVER/site-packages
+
+echo "experiment_id: $EXPERIMENT_ID" > $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
+echo "experiment_root: $CI_WORKSPACE_JOB" >> $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
+
+rm -r -f $HOME/cylc-run/${EXPERIMENT_ID}-suite
+
+cd $CI_WORKSPACE_JOB
+swell create ${SUITE_NAME} -m defaults -p nccs_discover -o $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
+swell launch $CI_WORKSPACE_JOB/${EXPERIMENT_ID}/${EXPERIMENT_ID}-suite --no-detach --log_path $CI_WORKSPACE_JOB/${EXPERIMENT_ID}
diff --git a/scripts/run-swell-ufo_testing.sh b/scripts/run-swell-ufo_testing.sh
new file mode 100644
index 0000000..e6c7c83
--- /dev/null
+++ b/scripts/run-swell-ufo_testing.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
+SUITE_NAME=ufo_testing
+CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
+EXPERIMENT_ID=swell-${SUITE_NAME}-${GITHUB_RUN_ID}
+
+mkdir -p $CI_WORKSPACE_JOB
+
+source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
+
+# Get python version
+PYVER=`python --version | awk '{print $2}' | awk -F. '{print $1"."$2}'`
+
+export PATH=$CI_WORKSPACE/swell/bin:$PATH
+export PYTHONPATH=${PYTHONPATH}:$CI_WORKSPACE/swell/lib/python$PYVER/site-packages
+
+echo "experiment_id: $EXPERIMENT_ID" > $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
+echo "experiment_root: $CI_WORKSPACE_JOB" >> $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
+
+rm -r -f $HOME/cylc-run/${EXPERIMENT_ID}-suite
+
+cd $CI_WORKSPACE_JOB
+swell create ${SUITE_NAME} -m defaults -p nccs_discover -o $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
+swell launch $CI_WORKSPACE_JOB/${EXPERIMENT_ID}/${EXPERIMENT_ID}-suite --no-detach --log_path $CI_WORKSPACE_JOB/${EXPERIMENT_ID}

From b5a7252791f43a527d54d11f19b02125a424dd12 Mon Sep 17 00:00:00 2001
From: Alexey Shiklomanov <alexey.shiklomanov@gmail.com>
Date: Sun, 2 Jun 2024 15:30:17 -0400
Subject: [PATCH 2/4] Add utils script for setting GH variables

---
 scripts/install-swell.sh         |  3 +++
 scripts/run-swell-3dvar.sh       |  5 +++++
 scripts/run-swell-hofx.sh        |  5 +++++
 scripts/run-swell-ufo_testing.sh |  3 +++
 scripts/utils.sh                 | 18 ++++++++++++++++++
 5 files changed, 34 insertions(+)
 create mode 100644 scripts/utils.sh

diff --git a/scripts/install-swell.sh b/scripts/install-swell.sh
index d3bb6a8..776a0f8 100644
--- a/scripts/install-swell.sh
+++ b/scripts/install-swell.sh
@@ -2,6 +2,9 @@
 
 set -euxo pipefail
 
+source scripts/utils.sh
+github_variables
+
 # Make experiment directory
 mkdir /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
 
diff --git a/scripts/run-swell-3dvar.sh b/scripts/run-swell-3dvar.sh
index 10d7d2b..ba34f12 100644
--- a/scripts/run-swell-3dvar.sh
+++ b/scripts/run-swell-3dvar.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+set -euxo pipefail
+
+source scripts/utils.sh
+github_variables
+
 CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
 SUITE_NAME=3dvar
 CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
diff --git a/scripts/run-swell-hofx.sh b/scripts/run-swell-hofx.sh
index e37cc0f..1c93f4d 100644
--- a/scripts/run-swell-hofx.sh
+++ b/scripts/run-swell-hofx.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+set -euxo pipefail
+
+source scripts/utils.sh
+github_variables
+
 CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
 SUITE_NAME=hofx
 CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
diff --git a/scripts/run-swell-ufo_testing.sh b/scripts/run-swell-ufo_testing.sh
index e6c7c83..a622068 100644
--- a/scripts/run-swell-ufo_testing.sh
+++ b/scripts/run-swell-ufo_testing.sh
@@ -2,6 +2,9 @@
 
 set -euxo pipefail
 
+source scripts/utils.sh
+github_variables
+
 CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
 SUITE_NAME=ufo_testing
 CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
diff --git a/scripts/utils.sh b/scripts/utils.sh
new file mode 100644
index 0000000..da125df
--- /dev/null
+++ b/scripts/utils.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+github_run_id() {
+  # Set default value to `LOCAL_$(uuidgen) if unset`
+  : "${GITHUB_RUN_ID:=LOCAL_$RANDOM}"
+  export $GITHUB_RUN_ID
+}
+
+github_workspace() {
+  # Set default value to current working directory
+  : "${GITHUB_WORKSPACE:=$PWD}"
+  export $GITHUB_WORKSPACE
+}
+
+github_variables() {
+  github_run_id
+  github_workspace
+}

From 6e5b7b6da4a10c710a0a14a8747036413ae2fa8f Mon Sep 17 00:00:00 2001
From: Alexey Shiklomanov <alexey.shiklomanov@gmail.com>
Date: Sun, 2 Jun 2024 15:36:07 -0400
Subject: [PATCH 3/4] Call all SWELL suites via `run-swell-suite` script

---
 .../swell-tier1_application_discover.yml      |  8 ++---
 scripts/run-swell-hofx.sh                     | 30 -------------------
 ...{run-swell-3dvar.sh => run-swell-suite.sh} | 16 +++++++++-
 scripts/run-swell-ufo_testing.sh              | 30 -------------------
 4 files changed, 19 insertions(+), 65 deletions(-)
 delete mode 100644 scripts/run-swell-hofx.sh
 rename scripts/{run-swell-3dvar.sh => run-swell-suite.sh} (76%)
 delete mode 100644 scripts/run-swell-ufo_testing.sh

diff --git a/.github/workflows/swell-tier1_application_discover.yml b/.github/workflows/swell-tier1_application_discover.yml
index 8899a25..a293c79 100644
--- a/.github/workflows/swell-tier1_application_discover.yml
+++ b/.github/workflows/swell-tier1_application_discover.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: install-swell
-        run: ./scripts/install-swell.sh
+        run: bash scripts/install-swell.sh
 
   # Run ufo_testing workflow
   # ------------------------
@@ -37,7 +37,7 @@ jobs:
     steps:
 
       - name: run-swell-ufo_testing
-        run: ./scripts/run-swell-ufo_testing.sh
+        run: bash scripts/run-swell-suite.sh ufo_testing
 
   # Move experiment directory on failure
   swell-tier_1-ufo_testing-failure:
@@ -66,7 +66,7 @@ jobs:
     steps:
 
       - name: run-swell-hofx
-        run: ./scripts/run-swell-hofx.sh
+        run: scripts/run-swell-suite.sh hofx
 
   # Move experiment directory on failure
   swell-tier_1-hofx-failure:
@@ -94,7 +94,7 @@ jobs:
     steps:
 
       - name: run-swell-3dvar
-        run: ./scripts/run-swell-3dvar.sh
+        run: bash scripts/run-swell-suite.sh 3dvar
 
   # Move experiment directory on failure
   swell-tier_1-3dvar-failure:
diff --git a/scripts/run-swell-hofx.sh b/scripts/run-swell-hofx.sh
deleted file mode 100644
index 1c93f4d..0000000
--- a/scripts/run-swell-hofx.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-source scripts/utils.sh
-github_variables
-
-CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
-SUITE_NAME=hofx
-CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
-EXPERIMENT_ID=swell-${SUITE_NAME}-${GITHUB_RUN_ID}
-
-mkdir -p $CI_WORKSPACE_JOB
-
-source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
-
-# Get python version
-PYVER=`python --version | awk '{print $2}' | awk -F. '{print $1"."$2}'`
-
-export PATH=$CI_WORKSPACE/swell/bin:$PATH
-export PYTHONPATH=${PYTHONPATH}:$CI_WORKSPACE/swell/lib/python$PYVER/site-packages
-
-echo "experiment_id: $EXPERIMENT_ID" > $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-echo "experiment_root: $CI_WORKSPACE_JOB" >> $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-
-rm -r -f $HOME/cylc-run/${EXPERIMENT_ID}-suite
-
-cd $CI_WORKSPACE_JOB
-swell create ${SUITE_NAME} -m defaults -p nccs_discover -o $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-swell launch $CI_WORKSPACE_JOB/${EXPERIMENT_ID}/${EXPERIMENT_ID}-suite --no-detach --log_path $CI_WORKSPACE_JOB/${EXPERIMENT_ID}
diff --git a/scripts/run-swell-3dvar.sh b/scripts/run-swell-suite.sh
similarity index 76%
rename from scripts/run-swell-3dvar.sh
rename to scripts/run-swell-suite.sh
index ba34f12..5d05da3 100644
--- a/scripts/run-swell-3dvar.sh
+++ b/scripts/run-swell-suite.sh
@@ -2,14 +2,26 @@
 
 set -euxo pipefail
 
+SUITE_NAME="$1"
+
+if [[ -z "$SUITE_NAME" ]]; then
+  echo "Variable SUITE_NAME is unset."
+  exit 1
+fi
+
 source scripts/utils.sh
 github_variables
 
 CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
-SUITE_NAME=3dvar
 CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
 EXPERIMENT_ID=swell-${SUITE_NAME}-${GITHUB_RUN_ID}
 
+echo "----------------------------------------"
+echo "CI_WORKSPACE=${CI_WORKSPACE}"
+echo "CI_WORKSPACE_JOB=${CI_WORKSPACE}"
+echo "EXPERIMENT_ID=${CI_WORKSPACE}"
+echo "----------------------------------------"
+
 mkdir -p $CI_WORKSPACE_JOB
 
 source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
@@ -20,6 +32,8 @@ PYVER=`python --version | awk '{print $2}' | awk -F. '{print $1"."$2}'`
 export PATH=$CI_WORKSPACE/swell/bin:$PATH
 export PYTHONPATH=${PYTHONPATH}:$CI_WORKSPACE/swell/lib/python$PYVER/site-packages
 
+echo "PYTHONPATH=${PYTHONPATH}"
+
 echo "experiment_id: $EXPERIMENT_ID" > $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
 echo "experiment_root: $CI_WORKSPACE_JOB" >> $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
 
diff --git a/scripts/run-swell-ufo_testing.sh b/scripts/run-swell-ufo_testing.sh
deleted file mode 100644
index a622068..0000000
--- a/scripts/run-swell-ufo_testing.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -euxo pipefail
-
-source scripts/utils.sh
-github_variables
-
-CI_WORKSPACE=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}
-SUITE_NAME=ufo_testing
-CI_WORKSPACE_JOB=/discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/${SUITE_NAME}
-EXPERIMENT_ID=swell-${SUITE_NAME}-${GITHUB_RUN_ID}
-
-mkdir -p $CI_WORKSPACE_JOB
-
-source /discover/nobackup/gmao_ci/swell/tier1/${GITHUB_RUN_ID}/modules
-
-# Get python version
-PYVER=`python --version | awk '{print $2}' | awk -F. '{print $1"."$2}'`
-
-export PATH=$CI_WORKSPACE/swell/bin:$PATH
-export PYTHONPATH=${PYTHONPATH}:$CI_WORKSPACE/swell/lib/python$PYVER/site-packages
-
-echo "experiment_id: $EXPERIMENT_ID" > $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-echo "experiment_root: $CI_WORKSPACE_JOB" >> $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-
-rm -r -f $HOME/cylc-run/${EXPERIMENT_ID}-suite
-
-cd $CI_WORKSPACE_JOB
-swell create ${SUITE_NAME} -m defaults -p nccs_discover -o $CI_WORKSPACE_JOB/${SUITE_NAME}-override.yaml
-swell launch $CI_WORKSPACE_JOB/${EXPERIMENT_ID}/${EXPERIMENT_ID}-suite --no-detach --log_path $CI_WORKSPACE_JOB/${EXPERIMENT_ID}

From dd2f6114f7893482569f953e2a6f6dbab4069e1d Mon Sep 17 00:00:00 2001
From: Alexey Shiklomanov <alexey.shiklomanov@gmail.com>
Date: Tue, 4 Jun 2024 13:47:47 -0400
Subject: [PATCH 4/4] Bugfix export statements

---
 scripts/utils.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/utils.sh b/scripts/utils.sh
index da125df..89df6e0 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -3,13 +3,13 @@
 github_run_id() {
   # Set default value to `LOCAL_$(uuidgen) if unset`
   : "${GITHUB_RUN_ID:=LOCAL_$RANDOM}"
-  export $GITHUB_RUN_ID
+  export GITHUB_RUN_ID
 }
 
 github_workspace() {
   # Set default value to current working directory
   : "${GITHUB_WORKSPACE:=$PWD}"
-  export $GITHUB_WORKSPACE
+  export GITHUB_WORKSPACE
 }
 
 github_variables() {