From 08ecd2ed8c9641f6f49c8e392bc1e07d132c995b Mon Sep 17 00:00:00 2001
From: laurenchilutti <60401591+laurenchilutti@users.noreply.github.com>
Date: Thu, 1 Sep 2022 14:25:53 -0400
Subject: [PATCH 1/2] adding parallelworks CI file

---
 .github/workflows/SHiELD_parallelworks.yml | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .github/workflows/SHiELD_parallelworks.yml

diff --git a/.github/workflows/SHiELD_parallelworks.yml b/.github/workflows/SHiELD_parallelworks.yml
new file mode 100644
index 000000000..ab759df4f
--- /dev/null
+++ b/.github/workflows/SHiELD_parallelworks.yml
@@ -0,0 +1,45 @@
+name: Compile SHiELD SOLO and run tests
+
+on:
+  pull_request:
+    branches:
+      - main
+jobs:
+  buildstep:
+    runs-on: [self-hosted]
+    name: SOLO SHiELD build
+    strategy:
+      fail-fast: true
+      max-parallel: 1
+      matrix:
+        runpath: [/pw/storage/PWscripts]
+        runscript: [FV3checkoutStartClusters.py, FV3swStartClusters.py, FV3nhStartClusters.py, FV3hydroStartClusters.py]
+    steps:
+      - env:
+          RUNPATH: ${{ matrix.runpath }}
+          RUNSCRIPT: ${{ matrix.runscript }}
+        run: python3 $RUNPATH/$RUNSCRIPT $GITHUB_REF
+        
+  tests:
+    runs-on: [self-hosted]
+    name: SOLO SHiELD test suite
+    needs: [buildstep]
+    strategy:
+      fail-fast: false
+      max-parallel: 3
+      matrix:
+        runpath: [/pw/storage/PWscripts]
+        runscript: [FV3C128r20.solo.superCStartClusters.py]
+    steps:
+      - env:
+          RUNPATH: ${{ matrix.runpath }}
+          RUNSCRIPT: ${{ matrix.runscript }}
+        run: python3 $RUNPATH/$RUNSCRIPT $GITHUB_REF
+        
+  shutdowncluster:
+    runs-on: [self-hosted]
+    name: Shutdown cluster
+    if: always()
+    needs: [buildstep, tests]
+    steps:
+      - run: python3 /home/Lauren.Chilutti/pw/storage/PWscripts/stopClusters.py ci_fv3

From 4ac55d0085afd86d3fcb234ee3527873ffbd0243 Mon Sep 17 00:00:00 2001
From: laurenchilutti <60401591+laurenchilutti@users.noreply.github.com>
Date: Wed, 14 Sep 2022 12:18:02 -0400
Subject: [PATCH 2/2] update to allow builds in parallel

---
 .github/workflows/SHiELD_parallelworks.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/SHiELD_parallelworks.yml b/.github/workflows/SHiELD_parallelworks.yml
index ab759df4f..21d8d87c1 100644
--- a/.github/workflows/SHiELD_parallelworks.yml
+++ b/.github/workflows/SHiELD_parallelworks.yml
@@ -5,25 +5,32 @@ on:
     branches:
       - main
 jobs:
-  buildstep:
+  checkout:
+    runs-on: [self-hosted]
+    name: Checkout Code
+    steps:
+    - run: python3 /pw/storage/PWscripts/FV3checkoutStartClusters.py $GITHUB_REF
+    
+  build:
     runs-on: [self-hosted]
     name: SOLO SHiELD build
+    needs: [checkout]
     strategy:
       fail-fast: true
-      max-parallel: 1
+      max-parallel: 3
       matrix:
         runpath: [/pw/storage/PWscripts]
-        runscript: [FV3checkoutStartClusters.py, FV3swStartClusters.py, FV3nhStartClusters.py, FV3hydroStartClusters.py]
+        runscript: [FV3swStartClusters.py, FV3nhStartClusters.py, FV3hydroStartClusters.py]
     steps:
       - env:
           RUNPATH: ${{ matrix.runpath }}
           RUNSCRIPT: ${{ matrix.runscript }}
         run: python3 $RUNPATH/$RUNSCRIPT $GITHUB_REF
         
-  tests:
+  test:
     runs-on: [self-hosted]
     name: SOLO SHiELD test suite
-    needs: [buildstep]
+    needs: [checkout, build]
     strategy:
       fail-fast: false
       max-parallel: 3
@@ -40,6 +47,6 @@ jobs:
     runs-on: [self-hosted]
     name: Shutdown cluster
     if: always()
-    needs: [buildstep, tests]
+    needs: [checkout, build, test]
     steps:
       - run: python3 /home/Lauren.Chilutti/pw/storage/PWscripts/stopClusters.py ci_fv3