#2786: download and install as separate tasks

esmvaltool/utils/recipe_run_workflow/recipe_run_workflow/app/install_cold/bin/install_cold.sh

@@ -3,7 +3,7 @@
 BASH_XTRACEFD=1
 set -eux
 
-# Remove source directories, if they exists.
+# Remove esmvaltool and esmvalcore directories, if they exist.
 if [[ -d ${ESMVALTOOL_DIR} ]]; then
     rm -rf "${ESMVALTOOL_DIR}"
 fi
@@ -12,20 +12,21 @@ if [[ -d ${ESMVALCORE_DIR} ]]; then
     rm -rf "${ESMVALCORE_DIR}"
 fi
 
+# Copy the site specific environment launch file to the cylc run /bin
+# Where it will be identified by rose task-run
 SOURCE_PATH="${CYLC_WORKFLOW_RUN_DIR}/site/${SITE}-env"
 TARGET_DIR="${CYLC_WORKFLOW_RUN_DIR}/bin"
-ENV_FILE="rrw-env"
+ENV_FILE="rrw-launch"
 
 # Create the 'bin' directory in the installed workflow.
 mkdir "${TARGET_DIR}"
 
-# Copy the environment file to the 'bin' directory.
+# Copy the environment launch file to the 'bin' directory.
 cp "${SOURCE_PATH}" "${TARGET_DIR}/${ENV_FILE}"
 
-# Checkout ESMValTool.
+# Launch the local site environment for access to pip
+rrw-launch
+
+# Checkout main branch for ESMValTool and ESMValCore from github.
 git clone -b "${BRANCH}" "${ESMVALTOOL_URL}" "${ESMVALTOOL_DIR}"
 git clone -b "${BRANCH}" "${ESMVALCORE_URL}" "${ESMVALCORE_DIR}"
-
-# Install ESMValTool.
-cd "${ESMVALTOOL_DIR}"
-# pip install . --prefix="${CYLC_WORKFLOW_RUN_DIR}"

esmvaltool/utils/recipe_run_workflow/recipe_run_workflow/app/install_cold/rose-app.conf

@@ -2,9 +2,10 @@
 default = install_cold.sh
 
 [env]
+SITE=${SITE}
+MODULE_NAME=${MODULE_NAME}
+ESMVALTOOL_DIR = ${CYLC_SUITE_RUN_DIR}/ESMValTool
+ESMVALCORE_DIR = ${CYLC_SUITE_RUN_DIR}/ESMValCore
 ESMVALTOOL_URL = [email protected]:ESMValGroup/ESMValTool.git
 ESMVALCORE_URL = [email protected]:ESMValGroup/ESMValCore.git
 BRANCH = main
-ESMVALTOOL_DIR = ${CYLC_SUITE_RUN_DIR}/ESMValTool
-ESMVALCORE_DIR = ${CYLC_SUITE_RUN_DIR}/ESMValCore
-SITE=${SITE}

esmvaltool/utils/recipe_run_workflow/recipe_run_workflow/app/install_esmvaltool/bin/install_esmvaltool.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# Send the output from 'set -x' to 'stdout' rather than 'stderr'.
+BASH_XTRACEFD=1
+set -eux
+
+# install esmvaltool from main branch
+cd "${ESMVALTOOL_DIR}"
+pip install . --prefix="${CYLC_WORKFLOW_RUN_DIR}"
+
+# install esmvaltool from main branch
+cd "${ESMVALCORE_DIR}"
+pip install . --prefix="${CYLC_WORKFLOW_RUN_DIR}"
+
+# this currently fails due to permissions issues when trying to install.
+# currently assuming it is trying to overwrite something in the installed
+# scitools module? (the launch file from task 1)

esmvaltool/utils/recipe_run_workflow/recipe_run_workflow/app/install_esmvaltool/rose-app.conf

@@ -0,0 +1,6 @@
+[command]
+default = install_esmvaltool.sh
+
+[env]
+ESMVALTOOL_DIR = ${CYLC_SUITE_RUN_DIR}/ESMValTool
+ESMVALCORE_DIR = ${CYLC_SUITE_RUN_DIR}/ESMValCore

esmvaltool/utils/recipe_run_workflow/recipe_run_workflow/flow.cylc

@@ -3,7 +3,7 @@
     allow implicit tasks = True
 [scheduling]
     [[graph]]
-        R1 = install_cold
+        R1 = install_cold => install_esmvaltool
 
 [runtime]
     [[root]]
@@ -18,5 +18,13 @@
         platform = localhost
         [[[environment]]]
             SITE = {{ SITE }}
+            MODULE_NAME = {{ MODULE_NAME }}
+
+    [[install_esmvaltool]]
+        platform = localhost
+        [[[environment]]]
+            SITE = {{ SITE }}
+            MODULE_NAME = {{ MODULE_NAME }}
+
 
 {% include 'site/' ~ SITE ~ '.cylc' %}

esmvaltool/utils/recipe_run_workflow/recipe_run_workflow/rose-suite.conf

@@ -1,3 +1,4 @@
 [template variables]
 SITE="metoffice"
-MODULE_NAME=""
+MODULE_NAME="scitools"
+PYTHON_VERSION = 3.10

esmvaltool/utils/recipe_run_workflow/recipe_run_workflow/site/metoffice-env

@@ -50,6 +50,3 @@ fi
 if [[ -z ${QUIET_MODE:-} ]]; then
     echo "[OK] Modules loaded."
 fi
-
-command="/usr/bin/time -v -o ${CYLC_TASK_LOG_ROOT}.time $@"
-exec ${command}