diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b7d4ee..d77e4c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,12 +9,13 @@ on: - main jobs: - docker-build-test-ubuntu: + run-canary-tests: runs-on: ubuntu-latest name: RunCanaryTests env: PRCOMMITSHA: ${{ github.event.pull_request.head.sha }} PRREPOSITORY: ${{ github.event.pull_request.head.repo.full_name }} + MOOSE_CONTAINER: oras://ghcr.io/idaholab/apptainer/moose-openmpi-x86_64:2026.08.12-167ee97 steps: - name: Checkout uses: actions/checkout@v4 @@ -25,16 +26,12 @@ jobs: with: apptainer-version: 1.3.6 - name: Pull MOOSE apptainer container - run: apptainer build moose-dev-openmpi.sif oras://ghcr.io/idaholab/apptainer/moose-dev-openmpi-x86_64:latest + run: apptainer build moose-openmpi.sif "$MOOSE_CONTAINER" - name: Create apptainer instance - run: apptainer instance start moose-dev-openmpi.sif moose_instance + run: apptainer instance start moose-openmpi.sif moose_instance - name: Checkout Canary - run: apptainer exec instance://moose_instance "git clone https://github.com/aurora-multiphysics/canary.git && cd canary && git checkout ${{ github.event.pull_request.head.sha }}" - - name: Checkout MOOSE - run: apptainer exec instance://moose_instance "git clone https://github.com/idaholab/moose.git" - - name: Build MOOSE test executable - run: apptainer exec instance://moose_instance "cd moose && ./configure --with-mfem && export MOOSE_JOBS=4 && cd test && make -j4" + run: apptainer exec instance://moose_instance bash -c "git clone https://github.com/${PRREPOSITORY:-$GITHUB_REPOSITORY}.git && cd canary && git checkout ${PRCOMMITSHA:-$GITHUB_SHA}" - name: Run Canary tests - run: apptainer exec instance://moose_instance "export MOOSE_DIR=$PWD/moose && ./canary/run_tests" + run: apptainer exec instance://moose_instance bash -c "cd canary && export MOOSE_DIR=/opt/moose && ./run_tests" - name: Close apptainer instance run: apptainer instance stop moose_instance diff --git a/run_tests b/run_tests index 03de921..4d05fd8 100755 --- a/run_tests +++ b/run_tests @@ -8,8 +8,9 @@ MOOSE_DIR = os.environ.get('MOOSE_DIR', MOOSE_DIR) sys.path.append(os.path.join(MOOSE_DIR, 'python')) -test_executable_path = os.path.join(MOOSE_DIR, 'test', 'moose_test') -print('Test executable path: ', test_executable_path) +print('MOOSE directory: ', MOOSE_DIR) + +os.environ['PATH'] = os.path.join(MOOSE_DIR, 'test') + os.pathsep + os.environ['PATH'] from TestHarness import TestHarness -TestHarness.buildAndRun(sys.argv, test_executable_path, MOOSE_DIR) +TestHarness.buildAndRun(sys.argv, 'moose_test', MOOSE_DIR)