From 1cec1bea3458e1f2b2e9bc0bd068a80c482e99f0 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Thu, 14 May 2020 04:19:07 -0600
Subject: [PATCH 1/2] Fix land-ice fluxes regression suite

It previously pointed to the old (E3SM v1) location for the
QU240 test case with ice-shelf cavities
---
 .../compass/ocean/regression_suites/land_ice_fluxes.xml    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/testing_and_setup/compass/ocean/regression_suites/land_ice_fluxes.xml b/testing_and_setup/compass/ocean/regression_suites/land_ice_fluxes.xml
index 422be01f2e..c81a428f31 100644
--- a/testing_and_setup/compass/ocean/regression_suites/land_ice_fluxes.xml
+++ b/testing_and_setup/compass/ocean/regression_suites/land_ice_fluxes.xml
@@ -32,10 +32,7 @@
 	<test name="sub-ice-shelf 2D - restart test" core="ocean" configuration="sub_ice_shelf_2D" resolution="5km" test="restart_test">
 		<script name="run_test.py"/>
 	</test>
-	<test name="QU 240km - Smoke Test" core="ocean" configuration="global_ocean_V1" resolution="QU240" test="with_land_ice">
-		<script name="run_test.py"/>
-	</test>
-	<test name="QU 120km - Smoke Test" core="ocean" configuration="global_ocean_V1" resolution="QU120" test="with_land_ice">
-		<script name="run_test.py"/>
+	<test name="QU 240km - Smoke Test" core="ocean" configuration="global_ocean" resolution="QU240wISC" test="init">
+		<script name="run.py"/>
 	</test>
 </regression_suite>

From c160e3159659d3e002f533caa0d3337c067e4d1d Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Thu, 14 May 2020 04:20:24 -0600
Subject: [PATCH 2/2] Fix the name of the LIGHT regression suite

---
 testing_and_setup/compass/ocean/regression_suites/light.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing_and_setup/compass/ocean/regression_suites/light.xml b/testing_and_setup/compass/ocean/regression_suites/light.xml
index 4bf9c1cf86..858bb984d9 100644
--- a/testing_and_setup/compass/ocean/regression_suites/light.xml
+++ b/testing_and_setup/compass/ocean/regression_suites/light.xml
@@ -1,4 +1,4 @@
-<regression_suite name="nightly_ocean_test_suite">
+<regression_suite name="light_test_suite">
 	<test name="Periodic Planar 20km - LIGHT particle general test" core="ocean" configuration="periodic_planar" resolution="20km" test="default_light">
 		<script name="run_test.py"/>
 	</test>