diff --git a/kgo_updates/kgo_update/kgo_update.py b/kgo_updates/kgo_update/kgo_update.py index 1b9435f..306700d 100755 --- a/kgo_updates/kgo_update/kgo_update.py +++ b/kgo_updates/kgo_update/kgo_update.py @@ -554,12 +554,8 @@ def _split_lines(self, text, width): hostname = os.uname()[1] if hostname == "uan01": platform = "ex1a" - elif hostname.startswith("xc"): - platform = "xc40" elif hostname.startswith("caz"): platform = "azspice" - else: - platform = "spice" # Make a connection to the database conn = connect_to_kgo_database(suite_dir) @@ -669,7 +665,7 @@ def _split_lines(self, text, width): print( f"\nThe kgo update for {platform} is complete.\n\nIf this was " "run from 'meto_update_kgo.sh' in the UM, the generated files " - "will be moved to UMDIR on spice and the process will continue " + "will be moved to UMDIR on vdi and the process will continue " "for other platforms requested.\n\nOtherwise, eg. for " "lfric_inputs, you will need to merge the generated variables " "file with the one in your working copy and run the script " diff --git a/kgo_updates/kgo_update/meto_run_kgo_script.sh b/kgo_updates/kgo_update/meto_run_kgo_script.sh index 47b8a1a..e7b5421 100755 --- a/kgo_updates/kgo_update/meto_run_kgo_script.sh +++ b/kgo_updates/kgo_update/meto_run_kgo_script.sh @@ -10,8 +10,7 @@ # assumes is in the same directory. It takes suite name, suite user, version # number, ticket number and required platforms as inputs. It runs the script on # each platform as required and then moves the generated variables file to -# ~frum/kgo_updated_variables/vnVV.V_tTTTT/ on linux. IF xc40 is being run it -# rsyncs with the xcs. +# $UMDIR/kgo_updated_variables/vnVV.V_tTTTT/ # This script is NOT intended to be run independently of '../meto_update_kgo.sh' # shellcheck disable=SC2059 @@ -22,12 +21,11 @@ GREEN='\033[0;32m' NC='\033[0m' # No Color # Read in command line arguments -while getopts S:U:E:Z:N:R:P:V:F: flag +while getopts S:U:Z:N:R:P:V:F: flag do case "${flag}" in S) suite_name=${OPTARG};; U) suite_user=${OPTARG};; - E) suite_user_ex1a=${OPTARG};; Z) ex_kgo_host=${OPTARG};; N) new_kgo_dir=${OPTARG};; R) new_release=${OPTARG};; @@ -43,36 +41,14 @@ kgo_command="./kgo_update.py" if [[ $new_release -eq 1 ]]; then kgo_command="${kgo_command} --new-release" fi -kgo_command="${kgo_command} -S $suite_name -N $new_kgo_dir -E $variables_extension" -kgo_command_spice="$kgo_command -U $suite_user -P spice" -kgo_command_azspice="$kgo_command -U $suite_user_ex1a -P azspice" -kgo_command_xc40="$kgo_command -U $suite_user -P xc40" -kgo_command_ex1a="$kgo_command -U $suite_user_ex1a -P ex1a" +kgo_command="${kgo_command} -S $suite_name -N $new_kgo_dir -E $variables_extension -U $suite_user" +kgo_command_azspice="$kgo_command -P azspice" +kgo_command_ex1a="$kgo_command -P ex1a" # Make a directory to store the script and variables file file in variables_dir=~/kgo_update_files/vn$version_number/$new_kgo_dir mkdir -p "$variables_dir" -# If spice has kgo updates -if [[ $platforms == *"spice"* ]] && [[ $platforms != *"azspice"* ]]; then - printf "${GREEN}\n\nRunning KGO Update Script on spice.\n${NC}" - - # Run the Update Script - if $kgo_command_spice; then - # Move the updated variables file and script into the ticket folder - printf "${GREEN}\n\nSuccessfully installed on spice.\n${NC}" - printf "${GREEN}Moving the generated files into spice ${variables_dir}.${NC}\n" - if [[ $new_release -ne 1 ]]; then - mv ~/"variables${variables_extension}_${new_kgo_dir}" \ - "${variables_dir}/spice_updated_variables${variables_extension}" - fi - mv ~/"kgo_update_${new_kgo_dir}.sh" \ - "${variables_dir}/spice_update_script.sh" - else - printf "${RED}\nThe installation script has failed on spice.\n${NC}" - fi -fi - # If azspice has kgo updates if [[ $platforms == *"azspice"* ]]; then printf "${GREEN}\n\nRunning KGO Update Script on azspice.\n${NC}" @@ -93,40 +69,6 @@ if [[ $platforms == *"azspice"* ]]; then fi fi -# If xc40 has kgo updates -if [[ $platforms == *"xc40"* ]]; then - printf "${GREEN}\n\nRunning KGO Update Script on xc40.\n${NC}" - - host_xc40=$(rose host-select xc) - - # SCP the python script to the xc40 - scp -q kgo_update.py "frum@${host_xc40}":~ - - # Define the commands to run on xc40 - command=". /etc/profile ; module load scitools ; - ${kgo_command_xc40}" - - # SSH to the xc40 with the run command - if ssh -Y "$host_xc40" "$command"; then - # rsync the generated variables file and script back to frum on linux - # This cleans up the original files - printf "${GREEN}\n\nSuccessfully installed on xc40.\n${NC}" - printf "${GREEN}Rsyncing the generated files into spice ${variables_dir}.\n${NC}" - if [[ $new_release -ne 1 ]]; then - rsync --remove-source-files -avz \ - "frum@$host_xc40:~/variables${variables_extension}_${new_kgo_dir}" \ - "${variables_dir}/xc40_updated_variables${variables_extension}" - fi - rsync --remove-source-files -avz \ - "frum@${host_xc40}:~/kgo_update_${new_kgo_dir}.sh" \ - "${variables_dir}/xc40_update_script.sh" - else - printf "${RED}\nThe installation script has failed on xc40.\n${NC}" - fi - - # Clean up kgo_update.py on xc40 - ssh -Yq "$host_xc40" "rm kgo_update.py" -fi # If ex1a has kgo updates if [[ $platforms == *"ex1a"* ]]; then diff --git a/kgo_updates/meto_update_kgo.sh b/kgo_updates/meto_update_kgo.sh index df13bb9..a72b147 100755 --- a/kgo_updates/meto_update_kgo.sh +++ b/kgo_updates/meto_update_kgo.sh @@ -21,21 +21,13 @@ NC='\033[0m' # No Color # Move to the location of the script script_loc="$(dirname "$(realpath "$0")")" -# Work out if we're running from azspice or old spice -if [[ $HOSTNAME == "caz"* ]]; then - root_user="umadmin" - root_home="/home/users/umadmin" - launch_platform=azspice - # Check you can sudo in as umadmin - sudo -iu ${root_user} bash -c "echo ''" || { - printf "${RED} You were unable to run commands as umadmin - this is required to run this script" - printf "This may be because of a password typo or similar" - } -else - root_user="frum" - root_home="/home/h01/frum" - launch_platform=spice -fi +root_user="umadmin" +root_home="/home/users/umadmin" +# Check you can sudo in as umadmin +sudo -iu ${root_user} bash -c "echo ''" || { + printf "${RED} You were unable to run commands as umadmin - this is required to run this script" + printf "This may be because of a password typo or similar" +} # Check for command line argument to run with new-release mode # If only option doesn't match ask if that is what was intended @@ -58,28 +50,9 @@ fi # Prompt user for Update Details echo "Enter the platforms requiring a kgo update" -echo "Enter platforms lowercase and space separated, eg. spice xc40 ex1a azspice" +echo "Enter platforms lowercase and space separated, eg. ex1a azspice" read -r platforms -if [[ $platforms == *"spice"* ]] && [[ $platforms != *"azspice"* ]] || [[ $platforms == *"xc40"* ]]; then - # Check we're not trying to install to spice while on azspice - if [[ $launch_platform == "azspice" ]] && [[ $platforms == *"spice"* ]] && [[ $platforms != *"azspice"* ]]; then - printf "${RED}Attempting to install spice kgo from azspice - this isn't possible" - exit 1 - fi - read -rp "spice/xc40 Suite Username: " suite_user -else - suite_user=None -fi -if [[ $platforms == *"ex1a"* ]] || [[ $platforms == *"azspice"* ]]; then - # Check we're not trying to install to azspice while on spice - if [[ $launch_platform == "spice" ]] && [[ $platforms == *"azspice"* ]]; then - printf "${RED}Attempting to install azspice kgo from spice - this isn't possible" - exit 1 - fi - read -rp "ex1a/azspice Suite Username: " suite_user_ex1a -else - suite_user_ex1a=None -fi +read -rp "Suite Username: " suite_user if [[ $platforms == *"ex1a"* ]]; then while : do @@ -125,12 +98,7 @@ fi # Get user to double check settings clear echo "Suite Name: ${suite_name}" -if [[ $platforms == *"spice"* ]] && [[ $platforms != *"azspice"* ]] || [[ $platforms == *"xc40"* ]]; then - echo "User: ${suite_user}" -fi -if [[ $platforms == *"ex1a"* ]] || [[ $platforms == *"azspice"* ]]; then - echo "ex1a User: ${suite_user_ex1a}" -fi +echo "ex1a User: ${suite_user}" if [[ $platforms == *"ex1a"* ]]; then echo "EX Host Zone: ${ex_kgo_host}" fi @@ -148,18 +116,13 @@ if [[ $run_script != "y" ]]; then exit 0 fi -# Move the kgo_update directory to frum on linux -if [[ $launch_platform == "spice" ]]; then - scp -rq "${script_loc}"/kgo_update ${root_user}@localhost:~ -else - sudo -iu ${root_user} bash -c "cp -r ${script_loc}/kgo_update ${root_home}" -fi +# Move the kgo_update directory to admin user on vdi +sudo -iu ${root_user} bash -c "cp -r ${script_loc}/kgo_update ${root_home}" -# Define command to run as frum +# Define command to run as admin user command=". /etc/profile ; module load scitools ; cd kgo_update ; ./meto_run_kgo_script.sh -S ${suite_name} -U ${suite_user} - -E ${suite_user_ex1a} -Z ${ex_kgo_host} -N ${new_kgo_dir} -R ${new_release} @@ -169,36 +132,13 @@ command=". /etc/profile ; module load scitools ; cd kgo_update ; cd ~ ; rm -rf kgo_update" # Run the command as admin user -if [[ $launch_platform == "spice" ]]; then - ssh -Y ${root_user}@localhost "$command" -else - sudo -iu ${root_user} bash -c "cd $UMDIR ; $command" -fi +sudo -iu ${root_user} bash -c "cd $UMDIR ; $command" # Error Checking and rsyncing variables_dir="kgo_update_files/vn${version_number}/${new_kgo_dir}" -succeeded_spice=0 succeeded_azspice=0 -succeeded_xc40=0 succeeded_ex1a=0 succeeded_all=1 -if [[ $platforms == *"spice"* ]] && [[ $platforms != *"azspice"* ]]; then - file=${root_home}/${variables_dir}/spice_update_script.sh - if [[ -e "$file" ]]; then - succeeded_spice=1 - if [[ $new_release -ne 1 ]]; then - printf "${GREEN}\n\nCopying the spice variables file into this working copy.\n${NC}" - scp -q ${root_user}@localhost:~/"${variables_dir}/spice_updated_variables${variables_extension}" \ - "${wc_path}/rose-stem/site/meto/variables_spice${variables_extension}" || { - printf "${RED}The copy of the spice variables file into this working copy has failed.\n${NC}" - succeeded_spice=0 - succeeded_all=0 - } - fi - else - succeeded_all=0 - fi -fi if [[ $platforms == *"azspice"* ]]; then file=${root_home}/${variables_dir}/azspice_update_script.sh if [[ -e "$file" ]]; then @@ -216,47 +156,15 @@ if [[ $platforms == *"azspice"* ]]; then succeeded_all=0 fi fi -if [[ $platforms == *"xc40"* ]]; then - file=${root_home}/${variables_dir}/xc40_update_script.sh - if [[ -e "$file" ]]; then - succeeded_xc40=1 - if [[ $new_release -ne 1 ]]; then - printf "${GREEN}\n\nCopying the xc40 variables file into this working copy.\n${NC}" - if [[ $launch_platform == "spice" ]]; then - scp -q "${root_user}@localhost:~/${variables_dir}/xc40_updated_variables${variables_extension}" \ - "${wc_path}/rose-stem/site/meto/variables_xc40${variables_extension}" - rc=$? - else - cp "${root_home}/${variables_dir}/xc40_updated_variables${variables_extension}" \ - "${wc_path}/rose-stem/site/meto/variables_xc40${variables_extension}" - rc=$? - fi - if [[ $rc -ne 0 ]]; then - printf "${RED}The copy of the xc40 variables file into this working copy has failed.\n${NC}" - succeeded_xc40=0 - succeeded_all=0 - fi - rc= - fi - else - succeeded_all=0 - fi -fi if [[ $platforms == *"ex1a"* ]]; then file=${root_home}/${variables_dir}/ex1a_update_script.sh if [[ -e "$file" ]]; then succeeded_ex1a=1 if [[ $new_release -ne 1 ]]; then printf "${GREEN}\n\nCopying the ex1a variables file into this working copy.\n${NC}" - if [[ $launch_platform == "spice" ]]; then - scp -q "${root_user}@localhost:~/${variables_dir}/ex1a_updated_variables${variables_extension}" \ - "${wc_path}/rose-stem/site/meto/variables_ex1a${variables_extension}" - rc=$? - else - cp "${root_home}/${variables_dir}/ex1a_updated_variables${variables_extension}" \ - "${wc_path}/rose-stem/site/meto/variables_ex1a${variables_extension}" - rc=$? - fi + cp "${root_home}/${variables_dir}/ex1a_updated_variables${variables_extension}" \ + "${wc_path}/rose-stem/site/meto/variables_ex1a${variables_extension}" + rc=$? if [[ $rc -ne 0 ]]; then printf "${RED}The copy of the ex1a variables file into this working copy has failed.\n${NC}" succeeded_ex1a=0 @@ -275,7 +183,7 @@ else printf "${RED}\n\nAt least 1 platform suffered an error during installation.\n${NC}" fi -if [[ $platforms == *"xc40"* ]] || [[ $platforms == *"ex1a"* ]]; then +if [[ $platforms == *"ex1a"* ]]; then read -rp "Enter 1 to rsync UM KGO, 2 to rsync lfricinputs KGO (default 1): " rsync_type if [[ $rsync_type == "2" ]]; then rsync_dir="lfricinputs/kgo/" @@ -284,28 +192,6 @@ if [[ $platforms == *"xc40"* ]] || [[ $platforms == *"ex1a"* ]]; then fi fi -# For the xc40s rsync the generated kgo to the xcs -if [[ $succeeded_xc40 -eq 1 ]]; then - printf "${GREEN}\n\nrsyncing the kgo to xcs.\n${NC}" - host_rsync=$(rose host-select xc) - rsync_com="ssh -Y ${host_rsync} 'rsync -av /projects/um1/standard_jobs/${rsync_dir} xcslr0:/common/um1/standard_jobs/${rsync_dir}'" - if [[ $launch_platform == "spice" ]]; then - ssh -Y ${root_user}@localhost "$rsync_com" - rc=$? - else - sudo -iu ${root_user} bash -c "$rsync_com" - rc=$? - fi - if [[ $rc -ne 0 ]]; then - printf "${RED}The rsync to the xcs has failed.\n${NC}" - else - printf "${GREEN}The rsync to the xcs has succeeded.\n${NC}" - fi - rc= -elif [[ $platforms == *"xc40"* ]]; then - printf "${RED}\n\nSkipping the rsync to the xcs as the xc40 install failed.\n${NC}" -fi - # For EX's currently rsync the generated kgo to the exz from the exab # This process will need modifying as we go forward # Currently hardcoded to UM kgo as lfricinputs not on ex machines @@ -315,13 +201,8 @@ if [[ $succeeded_ex1a -eq 1 ]]; then # rsync to EXZ rsync_com="ssh -Y ${host_from} 'rsync -av /common/internal/umdir/standard_jobs/${rsync_dir} login.exz:/common/umdir/standard_jobs/${rsync_dir}'" - if [[ $launch_platform == "spice" ]]; then - ssh -Y ${root_user}@localhost "$rsync_com" - rc=$? - else - sudo -iu ${root_user} bash -c "$rsync_com" - rc=$? - fi + sudo -iu ${root_user} bash -c "$rsync_com" + rc=$? if [[ $rc -ne 0 ]]; then printf "${RED}The rsync to the exz has failed.\n${NC}" else @@ -332,13 +213,8 @@ if [[ $succeeded_ex1a -eq 1 ]]; then # rsync to 2nd Host Zone host_to=$(rose host-select "$ex_rsync_host") rsync_com="ssh -Y ${host_from} 'rsync -av /common/internal/umdir/standard_jobs/${rsync_dir} ${host_to}:/common/internal/umdir/standard_jobs/${rsync_dir}'" - if [[ $launch_platform == "spice" ]]; then - ssh -Y ${root_user}@localhost "$rsync_com" - rc=$? - else - sudo -iu ${root_user} bash -c "$rsync_com" - rc=$? - fi + sudo -iu ${root_user} bash -c "$rsync_com" + rc=$? if [[ $rc -ne 0 ]]; then printf "${RED}The rsync to the ${host_to} has failed.\n${NC}" else @@ -350,13 +226,6 @@ elif [[ $platforms == *"ex1a"* ]]; then fi printf "\n\nInstallation Summary:\n\n" -if [[ $platforms == *"spice"* ]] && [[ $platforms != *"azspice"* ]]; then - if [[ $succeeded_spice -eq 1 ]]; then - printf "${GREEN}Installation on spice successful.\n${NC}" - else - printf "${RED}Installation on spice unsuccessful. Review output for error.\n${NC}" - fi -fi if [[ $platforms == *"azspice"* ]]; then if [[ $succeeded_azspice -eq 1 ]]; then printf "${GREEN}Installation on azspice successful.\n${NC}" @@ -364,13 +233,6 @@ if [[ $platforms == *"azspice"* ]]; then printf "${RED}Installation on azspice unsuccessful. Review output for error.\n${NC}" fi fi -if [[ $platforms == *"xc40"* ]]; then - if [[ $succeeded_xc40 -eq 1 ]]; then - printf "${GREEN}Installation on xc40 successful.\n${NC}" - else - printf "${RED}Installation on xc40 unsuccessful. Review output for error.\n${NC}" - fi -fi if [[ $platforms == *"ex1a"* ]]; then if [[ $succeeded_ex1a -eq 1 ]]; then printf "${GREEN}Installation on ex1a successful.\n${NC}" diff --git a/nightly_testing/example_meto_configs.yaml b/nightly_testing/example_meto_configs.yaml index 55d13df..c248c49 100644 --- a/nightly_testing/example_meto_configs.yaml +++ b/nightly_testing/example_meto_configs.yaml @@ -1,169 +1,221 @@ -############## -# UM Configs # -############## +base: + cylc_run_path: /home/users/umtest/cylc-run + rose_bush_base_url: https://cylchub/services/cylc-review/taskjobs/umtest/?suite= + wiki_url: http://code.metoffice.gov.uk/trac/lfric_apps + logo_file: um_logo.png + families: + lfric_apps: BUILD,RUN,CHECK,PLOT,SCRIPTS, + um: BUILD,RECON,ATMOS,ROSE_ANA_COMPARISON,CREATEBC,SCRIPTS, + jules: FAB,LINUX,METO_EX1A, + ukca: SCRIPTS, + +####################### +# Lfric Apps Configs # +####################### + +lfric_apps_set-revisions_nightly: + repo: lfric_apps + groups: all + revisions: set + vars: + - USE_EXAB=true + - HOUSEKEEPING=false + time_launch: 00:02 + time_clean: 03:05 + period: nightly_all -um_heads_all: - repo: um + +lfric_apps_heads_nightly: + repo: lfric_apps groups: all revisions: heads vars: + - USE_EXAB=true - HOUSEKEEPING=false - - PREBUILDS=false - monitoring: True - time_launch: 01:15 - time_clean: 00:15 - period: weekly + time_launch: 00:30 + time_clean: 03:35 + period: nightly_all -um_exz_heads_all: - repo: um +lfric_apps_excd_heads_nightly: + repo: lfric_apps groups: ex1a revisions: heads vars: - HOUSEKEEPING=false - - PREBUILDS=false - time_launch: 02:00 - time_clean: 01:00 - period: weekly + - USE_EXCD=true + time_launch: 04:45 + time_clean: 04:50 + period: nightly_all -um_xcs_heads_all: - repo: um - groups: xc40 +lfric_apps_set-revisions_next-cylc_nightly: + repo: lfric_apps + groups: developer + revisions: set + cylc_version: 8-next + vars: + - USE_EXAB=true + - HOUSEKEEPING=false + time_launch: 02:15 + time_clean: 02:25 + period: nightly_all + + +lfric_apps_heads_weekly: + repo: lfric_apps + groups: lfric_atm_ex1a_weekly revisions: heads vars: - - HOST_XC40=\"xcsr\" + - USE_EXAB=true - HOUSEKEEPING=false - - PREBUILDS=false - time_launch: 01:05 - time_clean: 00:05 + - USE_EXCD=true + time_launch: 02:00 + time_clean: 02:00 period: weekly -um_set-revisions_all: - repo: um +###################### +# LFRic Core Configs # +###################### + +lfric_nightly: + repo: lfric groups: all - revisions: set vars: + - USE_EXAB=true - HOUSEKEEPING=false - - PREBUILDS=false - time_launch: 01:30 - time_clean: 00:30 - period: weekly + time_launch: 04:45 + time_clean: 04:30 + period: nightly_all -um_exz_set-revisions_all: - repo: um +lfric_excd_nightly: + repo: lfric groups: ex1a - revisions: set vars: - HOUSEKEEPING=false - - PREBUILDS=false - time_launch: 02:30 - time_clean: 01:30 - period: weekly + - USE_EXCD=true + time_launch: 04:40 + time_clean: 04:35 + period: nightly_all -um_heads_nightly: +############## +# UM Configs # +############## + +################## +# Weekly Testing # +################## + +um_heads_all: repo: um - groups: nightly + groups: all revisions: heads vars: + - USE_EXAB=true - HOUSEKEEPING=false - PREBUILDS=false monitoring: True - time_launch: 01:15 + time_launch: 00:05 time_clean: 00:15 - period: nightly + period: weekly -um_exz_heads_nightly: +um_set-revisions_all: repo: um - groups: ex1a_nightly - revisions: heads + groups: all + revisions: set vars: + - USE_EXAB=true - HOUSEKEEPING=false - - PREBUILDS=false - time_launch: 02:00 - time_clean: 01:00 - period: nightly + - PREBUILDS=false + time_launch: 00:45 + time_clean: 00:30 + period: weekly -um_xcs_heads_nightly: +um_excd_heads_all: repo: um - groups: xc40_nightly + groups: ex1a revisions: heads vars: - - HOST_XC40=\"xcsr\" - HOUSEKEEPING=false - PREBUILDS=false - time_launch: 01:05 - time_clean: 00:05 - period: nightly + - USE_EXCD=true + time_launch: 04:10 + time_clean: 04:10 + period: weekly -um_set-revisions_nightly: +um_heads_weekly-portio2b: repo: um - groups: nightly + groups: fcm_make_portio2b,compiler_warning_check revisions: set vars: + - USE_EXAB=true - HOUSEKEEPING=false - PREBUILDS=false - time_launch: 01:30 - time_clean: 00:30 - period: nightly + time_launch: 05:30 + time_clean: 05:45 + period: weekly +################### +# Nightly Testing # +################### -um_exz_set-revisions_nightly: +um_heads_nightly: repo: um - groups: ex1a_nightly - revisions: set + groups: nightly + revisions: heads vars: + - USE_EXAB=true - HOUSEKEEPING=false - PREBUILDS=false - time_launch: 02:30 - time_clean: 01:30 + monitoring: True + time_launch: 00:05 + time_clean: 00:15 period: nightly -um_nightly_next-compiler: +um_set-revisions_nightly: repo: um - groups: spice_nightly + groups: nightly revisions: set vars: + - USE_EXAB=true - HOUSEKEEPING=false - PREBUILDS=false - - USE_NEXT_COMPILER=\"meto-xc40-cce,meto-x86-ifort,meto-x86-gnu\" - - COMPARE_OUTPUT=false - - COMPARE_WALLCLOCK=false - time_launch: 01:10 - time_clean: 00:10 - period: nightly_all + time_launch: 00:45 + time_clean: 00:30 + period: nightly -um_set-revisions_nightly_cylc7: +um_excd_heads_nightly: repo: um - groups: developer,ex1a_developer - cylc_version: 7 - revisions: set + groups: ex1a_nightly + revisions: heads vars: - HOUSEKEEPING=false - PREBUILDS=false - time_launch: 03:00 - time_clean: 02:00 - period: nightly_all + - USE_EXCD=true + time_launch: 04:10 + time_clean: 04:10 + period: nightly -um_set-revisions_nightly_next-cylc: +um_set-revisions_next-cylc_nightly: repo: um - groups: developer,ex1a_developer + groups: developer cylc_version: 8-next revisions: set vars: + - USE_EXAB=true - HOUSEKEEPING=false - PREBUILDS=false - time_launch: 03:00 - time_clean: 02:00 + time_launch: 03:30 + time_clean: 04:20 period: nightly_all @@ -175,52 +227,19 @@ jules_nightly: repo: jules groups: all vars: + - USE_EXAB=true - HOUSEKEEPING=false time_launch: 03:25 time_clean: 02:25 period: nightly_all -jules_exz_nightly: +jules_excd_nightly: repo: jules groups: ex1a vars: - HOUSEKEEPING=false - time_launch: 03:35 - time_clean: 02:35 - period: nightly_all - - -jules_xcs_nightly: - repo: jules - groups: xc40 - vars: - - METO_HPC_GROUP=\"xcs\" - - HOUSEKEEPING=false - time_launch: 03:30 - time_clean: 02:30 - period: nightly_all - - -jules_nightly_cylc7: - repo: jules - groups: all,ex1a - cylc_version: 7 - vars: - - HOUSEKEEPING=false - time_launch: 03:15 - time_clean: 02:15 - period: nightly_all - - -################ -# UKCA Configs # -################ - - -ukca_nightly: - repo: ukca - groups: scripts - time_launch: 04:00 - time_clean: 04:30 + - USE_EXCD=true + time_launch: 05:55 + time_clean: 06:30 period: nightly_all diff --git a/suite_report.py b/suite_report.py index 2a32668..d076d36 100755 --- a/suite_report.py +++ b/suite_report.py @@ -92,7 +92,7 @@ } RESOURCE_MONITORING_JOBS = { "meto": [ - "atmos-xc40_cce_um_fast_omp-seukv-4x9-noios-2t", + "atmos-ex1a_cce_um_safe_omp-seukv-4x9-noios-2t", ], "ecmwf": [], "nci": [], @@ -110,7 +110,7 @@ "Unknown": [], } CYLC_REVIEW_URL = { - "meto": "http://fcm1/cylc-review", + "meto": "https://cylchub/services/cylc-review", "ecmwf": "Unavailable", "nci": "http://accessdev.nci.org.au/cylc-review", "bom": "http://scs-watchdog-dev/rose-bush", @@ -140,24 +140,19 @@ "all", "nightly", "developer", - "xc40", - "ex1a", - "spice", - "xc40_nightly", - "ex1a_nightly", - "spice_nightly", - "xc40_developer", - "ex1a_developer", - "spice_developer", "ukca", "recon", "jules", - "xc40_ukca", + "ex1a", + "ex1a_nightly", + "ex1a_developer", "ex1a_ukca", - "spice_ukca", - "xc40_jules", "ex1a_jules", - "spice_jules", + "azspice", + "azspice_nightly", + "azspice_developer", + "azspice_ukca", + "azspice_jules", ], "ecmwf": [], "nci": [], @@ -662,12 +657,6 @@ def parse_rose_suite_run(self): self.trustzone = os.environ.get("TRUSTZONE", None) - self.host_xcs = False - if self.site == "meto": - for line in lines: - if "HOST_XC40='xcsr'" in line: - self.host_xcs = True - def initialise_projects(self): """Uses fcm kp to initialise a directory containing project keywords linked to SVN URLS. Format { : ,...} @@ -1912,8 +1901,6 @@ def print_report(self): ) if self.rose_orig_host is not None: trac_log.append(f" || ''ROSE_ORIG_HOST:'' || {self.rose_orig_host} || ") - if self.host_xcs: - trac_log.append(" || HOST_XCS || True || ") trac_log.append("") if self.uncommitted_changes: