#203 See if yaml is being parsed in flow.cylc

Author: Dana Singh

flow.cylc

@@ -13,7 +13,7 @@
 {# branch, the ppan site file should be specified. The ppan site comprises of gfdl specific tools. Other available #}
 {# sites include ppan, gfdl-ws, and generic. The generic.cylc site file is used for a portable flow.cylc.          #}
 {# (Probably, we should use similar mechanisms where sensible, e.g. for shared items among workflows)              #}
-{% set SITE = SITE %}
+{% set SITE = postprocess['settings']['site'] %}
 
 {# Setting STALL_TIMEOUT here provides the ability to override the value if necessary #}
 {# A use case for overriding this value is exhibited in the fre-workflows pipeline test_cloud_runner.yaml #}

for_gh_runner/runscript.sh

@@ -32,7 +32,7 @@ cd -
 # install/register cylc plugin
 pip install .
 cylc version --long
-exit 1
+#exit 1
 ##################################
 
 get_user_input () {
@@ -101,15 +101,21 @@ fre_pp_steps () {
     #Not sure if needed because if no global.cylc found, cylc uses default, which utilizes background jobs anyway ...
     #export CYLC_CONF_PATH=/mnt/cylc-src/${name}/generic-global-config/
 
-    ## Configure the rose-suite and rose-app files for the workflow
-    echo -e "\nRunning fre pp configure-yaml, combining separate yaml configs into one, then writing rose-suite/app config files ..."
-    fre -vv pp configure-yaml -e ${expname} -p ${plat} -t ${targ} -y ${yamlfile}
-    check_exit_status "CONFIGURE-YAML"
-
-    ## Validate the configuration files
-    echo -e "\nRunning fre pp validate, validating rose-suite/app config files ..."
-    fre -vv pp validate -e ${expname} -p ${plat} -t ${targ}
-    check_exit_status "VALIDATE"
+#    ## Configure the rose-suite and rose-app files for the workflow
+#    echo -e "\nRunning fre pp configure-yaml, combining separate yaml configs into one, then writing rose-suite/app config files ..."
+#    fre -vv pp configure-yaml -e ${expname} -p ${plat} -t ${targ} -y ${yamlfile}
+#    check_exit_status "CONFIGURE-YAML"
+    echo -e "\nRunning fre yamltools combine-yamls"
+    fre -vv yamltools combine-yamls -e ${expname} -p ${plat} -t ${targ} -y ${yamlfile} --use pp -o config.yaml
+    check_exit_status "COMBINE-YAMLS"
+    # move yaml to cylc-src
+    mv config.yaml /mnt/cylc-src/${name}/
+#############
+
+#    ## Validate the configuration files
+#    echo -e "\nRunning fre pp validate, validating rose-suite/app config files ..."
+#    fre -vv pp validate -e ${expname} -p ${plat} -t ${targ}
+#    check_exit_status "VALIDATE"
 
     # Install
     echo -e "\nRunning fre pp install, installing workflow in ${HOME}/cylc-run/${name} ..."
@@ -121,6 +127,10 @@ fre_pp_steps () {
     cylc play --no-detach --debug -s 'STALL_TIMEOUT="PT0S"' ${name}
     #check_exit_status "PLAY" # if cylc play fails and this is not commented, log uploading does not work
 
+#####
+    cat /mnt/cylc-run/${name}/log/config/flow-processed.cylc
+#####
+
     ## SUMMARY
     echo -e "\nWorkflow ended, final task states from workflow-state are ..."
     cylc workflow-state -v ${name}