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

ci: remove code owners from .integrated_tests.yaml #3503

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/.github/ @rrsettgast

/BASELINE_NOTES.md
/.integrated_tests.yaml @rrsettgast @CusiniM @cssherman @wrtobin @castelletto1 @jhuang2601 @paveltomin
/.integrated_tests.yaml
/inputFiles @rrsettgast @CusiniM @cssherman @paveltomin @jhuang2601
/inputFiles/compositionalMultiphaseFlow @paveltomin @dkachuma @tjb-ltk
/inputFiles/compositionalMultiphaseWell @CusiniM @paveltomin @tjb-ltk @dkachuma
Expand Down
24 changes: 22 additions & 2 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,22 @@ jobs:
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9
BUILD_SHARED_LIBS: ON
RUNS_ON: ubuntu-22.04
USE_SCCACHE: true

- name: Ubuntu debug (20.04, gcc 10.5.0, open-mpi 4.0.3) - github codespaces
CMAKE_BUILD_TYPE: Debug
DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10
BUILD_SHARED_LIBS: ON
RUNS_ON: ubuntu-22.04
USE_SCCACHE: true

- name: Ubuntu (20.04, gcc 10.5.0, open-mpi 4.0.3) - github codespaces
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10
BUILD_SHARED_LIBS: ON
RUNS_ON: ubuntu-22.04
USE_SCCACHE: true

- name: Ubuntu (22.04, gcc 11.4.0, open-mpi 4.1.2)
CMAKE_BUILD_TYPE: Release
Expand All @@ -168,40 +174,54 @@ jobs:
ENABLE_TRILINOS: OFF
GCP_BUCKET: geosx/ubuntu22.04-gcc11
BUILD_SHARED_LIBS: ON
RUNS_ON: ubuntu-22.04
USE_SCCACHE: true

- name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2)
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12
ENABLE_HYPRE: ON
ENABLE_TRILINOS: OFF
BUILD_SHARED_LIBS: ON
RUNS_ON: ubuntu-22.04
USE_SCCACHE: true

- name: Ubuntu (22.04, clang 15.0.7, open-mpi 4.1.2)
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/ubuntu22.04-clang15
ENABLE_HYPRE: ON
ENABLE_TRILINOS: OFF
BUILD_SHARED_LIBS: ON
RUNS_ON: ubuntu-22.04
USE_SCCACHE: true

- name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10)
BUILD_SHARED_LIBS: ON
CMAKE_BUILD_TYPE: Release
DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11
ENABLE_HYPRE: ON
ENABLE_TRILINOS: OFF
GCP_BUCKET: geosx/Sherlock-CPU
HOST_CONFIG: host-configs/Stanford/sherlock-gcc10.cmake
BUILD_SHARED_LIBS: ON
RUNS_ON: ubuntu-22.04
USE_SCCACHE: false

uses: ./.github/workflows/build_and_test.yml
with:
BUILD_AND_TEST_CLI_ARGS: ${{ matrix.BUILD_AND_TEST_CLI_ARGS }}
BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }}
CMAKE_BUILD_TYPE: ${{ matrix.CMAKE_BUILD_TYPE }}
DOCKER_CERTS_DIR: ${{ matrix.DOCKER_CERTS_DIR }}
DOCKER_CERTS_UPDATE_COMMAND: ${{ matrix.DOCKER_CERTS_UPDATE_COMMAND }}
DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }}
DOCKER_REPOSITORY: ${{ matrix.DOCKER_REPOSITORY }}
DOCKER_RUN_ARGS: ${{ matrix.DOCKER_RUN_ARGS }}
ENABLE_HYPRE: ${{ matrix.ENABLE_HYPRE }}
ENABLE_TRILINOS: ${{ matrix.ENABLE_TRILINOS }}
GCP_BUCKET: ${{ matrix.GCP_BUCKET }}
HOST_CONFIG: ${{ matrix.HOST_CONFIG }}
RUNS_ON: ubuntu-22.04
RUNS_ON: ${{ matrix.RUNS_ON }}
USE_SCCACHE: ${{ matrix.USE_SCCACHE }}
secrets: inherit

# If the 'ci: run integrated tests' PR label is found, the integrated tests will be run immediately after the cpu jobs.
Expand Down
2 changes: 1 addition & 1 deletion .integrated_tests.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
baselines:
bucket: geosx
baseline: integratedTests/baseline_integratedTests-pr3227-10037-26bd879
baseline: integratedTests/baseline_integratedTests-pr3503-10101-2cd8483

allow_fail:
all: ''
Expand Down
6 changes: 5 additions & 1 deletion BASELINE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ This file is designed to track changes to the integrated test baselines.
Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining.
These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).

PR #3227 (2024-02-01)
PR #3227 (2024-02-07)
=====================
Changed silo output to vtk for problematic test case.

PR #3227 (2024-02-05)
=====================
Add targetRegion for perforations (optional).

Expand Down
7 changes: 2 additions & 5 deletions inputFiles/solidMechanics/ModifiedCamClayWellbore_base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,8 @@

<!-- SPHINX_WELLBORE_OUTPUT -->
<Outputs>
<Silo
name="siloOutput"
parallelThreads="1"
plotFileRoot="plot"
/>
<VTK
name="vtkOutput"/>
<Restart
name="restartOutput"/>
</Outputs>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<PeriodicEvent
name="outputs"
target="/Outputs/siloOutput"/>
target="/Outputs/vtkOutput"/>
</Events>
<!-- SPHINX_WELLBORE_EXECUTION_END -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<PeriodicEvent
name="outputs"
target="/Outputs/siloOutput"/>
target="/Outputs/vtkOutput"/>

<PeriodicEvent
name="restarts"
Expand Down
Loading