#3060: Keep ESMVal URLs with the clone app, fix typos, updates to att…

…empt to get this working on JASMIN
ESMValGroup · Aug 30, 2023 · af5c09f · af5c09f
1 parent 95ae33b
commit af5c09f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 15 deletions.
diff --git a/...ool/utils/recipe_test_workflow/recipe_test_workflow/app/clone_latest_esmval/rose-app.conf b/...ool/utils/recipe_test_workflow/recipe_test_workflow/app/clone_latest_esmval/rose-app.conf
@@ -3,6 +3,5 @@ default=clone_latest_esmval.sh
 
 [env]
 BRANCH=main
-ESMVALCORE_URL=${ESMVALCORE_URL}
-ESMVALTOOL_URL=${ESMVALTOOL_URL}
-SITE=${SITE}
+ESMVALCORE_URL="https://github.com/ESMValGroup/ESMValCore.git"
+ESMVALTOOL_URL="https://github.com/ESMValGroup/ESMValTool.git"
diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc
@@ -20,7 +20,6 @@
 
 [runtime]
     [[root]]
-        platform = localhost
         script = rose task-run
         env-script = "eval $(rose task-env)"
         [[[environment]]]
@@ -35,14 +34,13 @@
     [[install_env_file]]
         platform = localhost
         [[[environment]]]
-            ESMVALCORE_URL = {{ ESMVALCORE_URL }}
-            ESMVALTOOL_URL = {{ ESMVALTOOL_URL }}
             SITE = {{ SITE }}
 
     [[clone_latest_esmval]]
         platform = localhost
 
     [[configure]]
+        platform = localhost
         pre-script = "mkdir -p ${USER_CONFIG_DIR}"
         [[[environment]]]
             ROSE_TASK_APP = configure

diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/meta/rose-meta.conf b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/meta/rose-meta.conf
@@ -182,4 +182,4 @@ compulsory=true
 description=The site at which the Rose suite will run.
 help=This value must be set in a site-specific configuration file located in
     =the 'opt/' directory.
-values="metoffice"
+values="metoffice, jasmin"
diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/opt/rose-suite-jasmin.conf b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/opt/rose-suite-jasmin.conf
@@ -1,11 +1,7 @@
 [template variables]
 DRS_CMIP5="BADC"
 DRS_CMIP6="BADC"
-DRS_OBS="default"
-DRS_OBS4MIPS="default"
-ESMVALCORE_URL="https://github.com/ESMValGroup/ESMValCore.git"
-ESMVALTOOL_URL="https://github.com/ESMValGroup/ESMValTool.git"
-KGO_ROOT_PATH="/gws/nopw/j04/esmeval/KGO_v2.6.0/"
+KGO_ROOT_PATH="/gws/nopw/j04/esmeval/KGO_v2.7.0/"
 MODULE_NAME="esmvaltool/2.7"
 ROOTPATH_CMIP5="/badc/cmip5/data/cmip5/output1"
 ROOTPATH_CMIP6="/badc/cmip6/data/CMIP6"

diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/rose-suite.conf b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/rose-suite.conf
@@ -8,8 +8,6 @@ DRS_NATIVE6="default"
 DRS_OBS="default"
 DRS_OBS4MIPS="default"
 DRS_OBS6="default"
-ESMVALCORE_URL=""
-ESMVALTOOL_URL=""
 KGO_ROOT_PATH=""
 MAX_PARALLEL_TASKS=4
 MODULE_NAME=""

diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/jasmin-env b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/jasmin-env
@@ -1,6 +1,6 @@
 #!/bin/bash -l
 #
-# Usage metoffice-env COMMAND
+# USAGE jasmin-env COMMAND
 #
 # ENVIRONMENT
 #   MODULE_NAME         The name of the module to load