Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Review rose-app.conf files in recipe test workflow #3601

Merged
merged 51 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
b79f432
#3571: Recplace compare script with conf.
mo-gill May 20, 2024
1e28b09
#3571: reformatted with rose-config dump.
mo-gill May 20, 2024
c38566d
#3571: Implement rose-config version of install_env_file.sh
mo-gill May 21, 2024
34a5cf0
#3571: Remove unnecessary source pull.
mo-gill May 21, 2024
3c80a9e
#3571: Move env variables from app to suite level.
mo-gill May 21, 2024
a09ffb0
#3571: Remove .sh file to fix merge conflict.
mo-gill May 22, 2024
d29a01b
#3571: Correction to file path of an install folder.
mo-gill May 22, 2024
dcf671a
#3571: Correction of documentation.
mo-gill May 22, 2024
e6f2074
#3571: Add shellcheck to testing workflow.
mo-gill May 24, 2024
bba02df
#3571: Remove unnecessary comment.
mo-gill May 28, 2024
55bbf30
#3571: Amend names of path variables.
mo-gill May 29, 2024
0bba951
#3571: More adjustment of variable names.
mo-gill May 29, 2024
7d1c535
#3571: Change path and dir names.
mo-gill Jun 17, 2024
6dc240d
#3571: Rename KGO dir environment variable.
mo-gill Jun 17, 2024
4da101b
#3571: Lint all shell scripts.
mo-gill Jun 17, 2024
4ef9133
#3571: Test to check shellcheck working in workflow.
mo-gill Jun 17, 2024
369ac7d
#3571: Correction to my test.
mo-gill Jun 17, 2024
ee60d45
#3571: Removing mock broken .sh files.
mo-gill Jun 17, 2024
8fe236e
#3571: Correction of workflow name.
mo-gill Jun 17, 2024
f481c1f
#3571: Ascertain working dir in workflow.
mo-gill Jun 18, 2024
896a0bd
#3571: Add cd to rtw and a mock broken test.
mo-gill Jun 18, 2024
776a231
#3571: Attempt to get non-zero exit on shellcheck warnings.
mo-gill Jun 18, 2024
1996812
#3571: Remove mock broken test.
mo-gill Jun 18, 2024
5b8c0e1
#3571: Modify test to check for warnings. Add mock tests.
mo-gill Jun 18, 2024
8eae9be
#3571: Modify shellcheck test.
mo-gill Jun 18, 2024
cccf541
#3571: Modify test to echo output.
mo-gill Jun 18, 2024
90d5ed9
#3571: Remove mock broken scripts as shellcheck now working.
mo-gill Jun 18, 2024
06374ab
#3571: Correction to workflow task spelling.
mo-gill Jun 18, 2024
5f016dc
Merge branch 'recipe_test_workflow_prototype' of github.com:ESMValGro…
mo-gill Jun 18, 2024
5d6816a
#3571: Reverse patch changes to env file.
mo-gill Jun 19, 2024
19412b7
#3571: Test removing print output on non zeros.
mo-gill Jun 19, 2024
4bfdd6c
#3571: Try set -x to troubleshoot shellcheck issues.
mo-gill Jun 19, 2024
37ff826
#3571: Try as one long command.
mo-gill Jun 19, 2024
c848fab
#3571: Try changing variable name.
mo-gill Jun 19, 2024
98a8de3
#3571: Change variable name back to output to check it still works.
mo-gill Jun 19, 2024
d9c29a8
#3571: Add dummy test to check check-rtw workflow runs.
mo-gill Jun 19, 2024
f39b9e1
#3571: Try changing variable names again.
mo-gill Jun 19, 2024
cfcd24a
#3571: Add dummy file again to check workflow.
mo-gill Jun 20, 2024
e188f02
#3571: Test with broken shell scripts.
mo-gill Jun 20, 2024
0815666
#3571: Remove dummy broken scripts.
mo-gill Jun 20, 2024
b888455
#3571: Test removing shellcheck to see if workflow still prints conda…
mo-gill Jun 20, 2024
5881f5e
#3571: Add dummy file.
mo-gill Jun 20, 2024
8c5283f
#3571: Remove dummy test as conda env printout seems to be standard w…
mo-gill Jun 20, 2024
b81e59a
Merge branch 'recipe_test_workflow_prototype' into 3571_review_rose_a…
mo-gill Jun 21, 2024
d8f33cc
#3571: Change workflow task name and remove spaces.
mo-gill Jun 24, 2024
b0af8c2
#3571: Rose config dump needed.
mo-gill Jun 24, 2024
cfc38ce
Revert "#3571: Rose config dump needed."
ehogan Jun 25, 2024
3361ea6
#3571: rose config-dump requires the empty line after the comment
ehogan Jun 25, 2024
b120b47
#3571: Add a COMPARE family
ehogan Jun 25, 2024
ee7c423
Merge branch 'recipe_test_workflow_prototype' into 3571_review_rose_a…
ehogan Jun 25, 2024
e240ce2
Merge branch 'recipe_test_workflow_prototype' into 3571_review_rose_a…
ehogan Jun 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/check-rtw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,9 @@ jobs:
run: |
cd esmvaltool/utils/recipe_test_workflow/doc
make linkcheck

- name: Lint shell scripts in Recipe Test Workflow with ShellCheck
ehogan marked this conversation as resolved.
Show resolved Hide resolved
run: |
cd esmvaltool/utils/recipe_test_workflow
output=$(find . -name "*.sh" -exec shellcheck {} \;)
if [ "$output" ]; then echo "${output}" && exit 1; fi

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
[command]
default=rtw-env compare_task_runner.sh

[env]
KGO_ROOT_PATH=${KGO_ROOT_PATH}
default=rtw-env python ${COMPARE_SCRIPT} ${KGO_DIR} ${COMPARISON_OUTPUT_DIR} --verbose

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Copy the site specific environment file to the 'share/bin' directory in the
# installed Cylc workflow (this directory is automatically added to the
# ${PATH} by Cylc).
ehogan marked this conversation as resolved.
Show resolved Hide resolved

ehogan marked this conversation as resolved.
Show resolved Hide resolved
[command]
default=install_env_file.sh
default=cp ${ENV_FILE_SITE_PATH} ${SHARE_BIN_DIR}/${ENV_FILE}

[env]
SITE=${SITE}
[file:${SHARE_BIN_DIR}]
mode=mkdir
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
platform = localhost
[[[environment]]]
SITE = {{ SITE }}
ENV_FILE=rtw-env
ENV_FILE_SITE_PATH=${CYLC_WORKFLOW_RUN_DIR}/site/${SITE}-env
SHARE_BIN_DIR=${CYLC_WORKFLOW_SHARE_DIR}/bin

[[get_esmval]]
[[[environment]]]
Expand Down Expand Up @@ -99,6 +102,10 @@
ROSE_TASK_APP = compare
RECIPE_NAME = "${CYLC_TASK_PARAM_fast##*--}"
KGO_ROOT_PATH = {{ KGO_ROOT_PATH }}
COMPARE_SCRIPT=${ESMVALTOOL_DIR}/esmvaltool/utils/testing/regression/compare.py
COMPARISON_OUTPUT_DIR=${OUTPUT_DIR}/${RECIPE_NAME}*
KGO_DIR=${KGO_ROOT_PATH}/${RECIPE_NAME}*
ehogan marked this conversation as resolved.
Show resolved Hide resolved

ehogan marked this conversation as resolved.
Show resolved Hide resolved

[[compare<medium>]]
inherit = None, COMPUTE
Expand Down