From 1dad3e9bff8ce6acb02e035ce87ed40ad01e440e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 26 Apr 2024 18:54:31 -0600 Subject: [PATCH 1/9] .github/workflows/run_ec2_pcluster.yaml -> .github/workflows/ubuntu-ci-x86_64.yaml --- ...c2_pcluster.yaml => ubuntu-ci-x86_64.yaml} | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) rename .github/workflows/{run_ec2_pcluster.yaml => ubuntu-ci-x86_64.yaml} (87%) diff --git a/.github/workflows/run_ec2_pcluster.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml similarity index 87% rename from .github/workflows/run_ec2_pcluster.yaml rename to .github/workflows/ubuntu-ci-x86_64.yaml index a975104..627742e 100644 --- a/.github/workflows/run_ec2_pcluster.yaml +++ b/.github/workflows/ubuntu-ci-x86_64.yaml @@ -16,7 +16,7 @@ defaults: jobs: test-ufs-bundle: - runs-on: [self-hosted, Linux, X64, pcluster-ci-20230717] + runs-on: [ubuntu-ci-c6a-x86_64] steps: - name: cleanup @@ -79,14 +79,17 @@ jobs: ulimit -s unlimited ulimit -c unlimited - source /etc/profile.d/z00_lmod.sh - source /etc/profile.d/z01_lmod.sh + source /etc/profile.d/modules.sh - source /opt/intel/oneapi/compiler/2022.1.0/env/vars.sh + source /opt/intel/oneapi/compiler/2023.2.3/env/vars.sh + source /opt/intel/oneapi/mpi/2021.10.0/env/vars.sh - module use /mnt/experiments-efs/skylab-v8/spack-stack-1.7.0-ci-c6i/envs/ue-intel-2021.6.0/install/modulefiles/Core - module load stack-intel/2021.6.0 - module load stack-intel-oneapi-mpi/2021.6.0 + module use /home/ubuntu/spack-stack/modulefiles + module load ecflow/5.11.4 + + module use /home/ubuntu/spack-stack/spack-stack-1.7.0/envs/ue-intel-2021.10.0/install/modulefiles/Core/ + module load stack-intel/2021.10.0 + module load stack-intel-oneapi-mpi/2021.10.0 module load stack-python/3.10.13 module load sp/2.5.0 @@ -95,13 +98,9 @@ jobs: module li - export I_MPI_DEBUG=5 - export I_MPI_FABRICS=shm - export I_MPI_PIN_DOMAIN=omp export KMP_AFFINITY=compact export KMP_STACKSIZE=2048m export OMP_NUM_THREADS=1 - export SLURM_EXPORT_ENV=ALL EOF @@ -182,8 +181,8 @@ jobs: message_format: '{emoji} *{workflow}* {status_message} for branch {branch} in <{repo_url}|{repo}>' footer: ${{ github.event.pull_request.number || github.event_name || 'workflow dispatched manually' }} # For testing: only notify user Dom - #mention_users: 'U02NLGXF5HV' - #mention_users_when: 'failure,warnings' + mention_users: 'U02NLGXF5HV' + mention_users_when: 'failure,warnings' # Default: notify channel - mention_groups: '!channel' - mention_groups_when: 'failure,warnings' + # DH* TODO REVERT mention_groups: '!channel' + # DH* TODO REVERT mention_groups_when: 'failure,warnings' From 78f9bf32a169f001fc308a27830e1085d405cd9d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 26 Apr 2024 20:09:22 -0600 Subject: [PATCH 2/9] Add missing module load of awscli-v2 for CI --- .github/workflows/ubuntu-ci-x86_64.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubuntu-ci-x86_64.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml index 627742e..235fca8 100644 --- a/.github/workflows/ubuntu-ci-x86_64.yaml +++ b/.github/workflows/ubuntu-ci-x86_64.yaml @@ -92,6 +92,7 @@ jobs: module load stack-intel-oneapi-mpi/2021.10.0 module load stack-python/3.10.13 module load sp/2.5.0 + module load awscli-v2 module load jedi-ufs-env module load fms/2023.04 From db67bf719ada403aba223b45fc980f552e4944f6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 30 Apr 2024 14:13:51 -0600 Subject: [PATCH 3/9] Trigger CI From 8e6e0214d4a731cc0c69ff5df07ee2986502c4cd Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 30 Apr 2024 21:02:19 -0600 Subject: [PATCH 4/9] Temporarily change name of fv3-jedi branch for testing --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a1ae73..b16342a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,7 +179,7 @@ ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda-internal/femps.gi if(UFS_APP MATCHES "^(ATMAERO)$" OR UFS_APP MATCHES "^(S2S)$" OR UFS_APP MATCHES "^(ATM)$") option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT fv3-jedi-data GIT "https://github.com/JCSDA-internal/fv3-jedi-data.git" BRANCH develop UPDATE ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH develop UPDATE ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH bugfix/setup_c48_envmod UPDATE ) #develop UPDATE ) elseif(UFS_APP MATCHES "^(NG-GODAS)$") ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/ufs_dom_update UPDATE ) add_dependencies(soca ufs-weather-model) From 88dcf38c08467b431d839cb71fa8b71b75e7386b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 1 May 2024 05:19:30 -0600 Subject: [PATCH 5/9] Trigger CI From 562b701ca0361531585a3ea7e44761e6fce09b56 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 1 May 2024 06:09:34 -0600 Subject: [PATCH 6/9] For debugging, always clean up run directory --- .github/workflows/ubuntu-ci-x86_64.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-ci-x86_64.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml index 235fca8..568ac88 100644 --- a/.github/workflows/ubuntu-ci-x86_64.yaml +++ b/.github/workflows/ubuntu-ci-x86_64.yaml @@ -20,7 +20,8 @@ jobs: steps: - name: cleanup - if: ${{ github.event_name == 'schedule' }} + # DH* REVERT - DO CLEAN UP WITH NEXT PR NO MATTER WHAT + #if: ${{ github.event_name == 'schedule' }} env: JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run run: | From 4936ced50d502dc7e7e0c76c8105cc40f8bbc810 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 1 May 2024 15:22:53 -0600 Subject: [PATCH 7/9] Revert temporary fv3-jedi branch name change --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b16342a..9a1ae73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,7 +179,7 @@ ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda-internal/femps.gi if(UFS_APP MATCHES "^(ATMAERO)$" OR UFS_APP MATCHES "^(S2S)$" OR UFS_APP MATCHES "^(ATM)$") option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON) ecbuild_bundle( PROJECT fv3-jedi-data GIT "https://github.com/JCSDA-internal/fv3-jedi-data.git" BRANCH develop UPDATE ) - ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH bugfix/setup_c48_envmod UPDATE ) #develop UPDATE ) + ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH develop UPDATE ) elseif(UFS_APP MATCHES "^(NG-GODAS)$") ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/ufs_dom_update UPDATE ) add_dependencies(soca ufs-weather-model) From 6394ceaa19fde9362c0287686ac91d46445ac5f1 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 1 May 2024 15:23:54 -0600 Subject: [PATCH 8/9] Revert temporary change in .github/workflows/ubuntu-ci-x86_64.yaml --- .github/workflows/ubuntu-ci-x86_64.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-ci-x86_64.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml index 568ac88..235fca8 100644 --- a/.github/workflows/ubuntu-ci-x86_64.yaml +++ b/.github/workflows/ubuntu-ci-x86_64.yaml @@ -20,8 +20,7 @@ jobs: steps: - name: cleanup - # DH* REVERT - DO CLEAN UP WITH NEXT PR NO MATTER WHAT - #if: ${{ github.event_name == 'schedule' }} + if: ${{ github.event_name == 'schedule' }} env: JEDI_ENV: /home/ubuntu/ufs-bundle/jedi_run run: | From 60113c09d5b3b926dc500463ed82134a8e66d074 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 1 May 2024 15:26:08 -0600 Subject: [PATCH 9/9] Revert one more temporary change in .github/workflows/ubuntu-ci-x86_64.yaml --- .github/workflows/ubuntu-ci-x86_64.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu-ci-x86_64.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml index 235fca8..fa9f162 100644 --- a/.github/workflows/ubuntu-ci-x86_64.yaml +++ b/.github/workflows/ubuntu-ci-x86_64.yaml @@ -182,8 +182,8 @@ jobs: message_format: '{emoji} *{workflow}* {status_message} for branch {branch} in <{repo_url}|{repo}>' footer: ${{ github.event.pull_request.number || github.event_name || 'workflow dispatched manually' }} # For testing: only notify user Dom - mention_users: 'U02NLGXF5HV' - mention_users_when: 'failure,warnings' + #mention_users: 'U02NLGXF5HV' + #mention_users_when: 'failure,warnings' # Default: notify channel - # DH* TODO REVERT mention_groups: '!channel' - # DH* TODO REVERT mention_groups_when: 'failure,warnings' + mention_groups: '!channel' + mention_groups_when: 'failure,warnings'