Merge pull request #1 from islas/test-workflow

Using original master branch naming

Author: islas

.ci/env/hostenv.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+hostname=$( uname -n )
+
+if [ "${hostname}" = "polaris" ]; then
+  # WSL Agent
+  . .ci/env/wsl.sh
+elif [ "${hostname}" = *"cheyenne"* ]; then
+  # Cheyenne HPC SuSE PBS
+  echo "not set yet"
+fi

.ci/env/wsl.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export NETCDF=/opt/ncar/netcdf/
+export MPICH=/opt/ncar/mpich

.ci/tests/build.sh

@@ -2,11 +2,14 @@
 workingDirectory=$1
 shift
 compileOption=$1
-makejobs=$3
+makejobs=$2
 
 cd $workingDirectory
 
-echo -ne "$compileOption\n" | ./configure
+. .ci/env/hostenv.sh
+
+./clean -a
+echo "$compileOption" | ./configure
 
 if [ ! -f configure.wrf ]; then
   echo  "Failed to configure"

.ci/wrf_arw_tests.json

@@ -8,32 +8,32 @@
   {
     "submit_options" :
     {
-      "resources"         : "1:ncpus=12",
+      "resources"         : "1:ncpus=20",
       "timelimit"         : "01:00:00"
     },
     "steps" :
     {
       "serial" :
        { 
         "command"      : ".ci/tests/build.sh",
-        "arguments"    : [ "32", "-j 12" ]
+        "arguments"    : [ "32", "-j 20" ]
       },
       "sm" :
        { 
         "command"      : ".ci/tests/build.sh",
-        "arguments"    : [ "33", "-j 12" ],
+        "arguments"    : [ "33", "-j 20" ],
         "dependencies" : { "serial" : "afterany" }
       },
       "dm" :
        { 
         "command"      : ".ci/tests/build.sh",
-        "arguments"    : [ "34", "-j 12" ],
+        "arguments"    : [ "34", "-j 20" ],
         "dependencies" : { "sm" : "afterany" }
       },
       "dm+sm" :
        { 
         "command"      : ".ci/tests/build.sh",
-        "arguments"    : [ "35", "-j 12" ],
+        "arguments"    : [ "35", "-j 20" ],
         "dependencies" : { "dm" : "afterany" }
       }
     }

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: Regression Suite
 
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
     types:    [ labeled ]
 
@@ -15,12 +15,15 @@ jobs:
       pull-requests: write
     steps:
     - uses: actions/checkout@v3
-    - name: Run test 0
+      with: 
+        submodules: true
+
+    - name: Test GNU Compilation
       run: |
         ./hpc-workflows/.ci/runner.py .ci/wrf_arw_tests.json gnu -s LOCAL -d ..
 
     - name : Remove 'test' label
-      if : ${{ github.event.label.name == 'test' }}
+      if : ${{ !cancelled() && github.event.label.name == 'test' }}
       env:
         PR_NUMBER: ${{ github.event.number }}
       run: |