diff --git a/.ci/install-downstream.sh b/.ci/install-downstream.sh deleted file mode 100755 index f9b0e36b3c5cf1ecde5558ee6c703bac0192521e..0000000000000000000000000000000000000000 --- a/.ci/install-downstream.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -# Installs the downstream project specified in $DOWNSTREAM_PROJECT - -set -o errexit - -if [[ "$DOWNSTREAM_PROJECT" = "mirgecom" ]]; then - git clone "https://github.com/illinois-ceesd/$DOWNSTREAM_PROJECT.git" -else - git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git" -fi - -cd "$DOWNSTREAM_PROJECT" -echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)" - -transfer_requirements_git_urls ../requirements.txt ./requirements.txt -edit_requirements_txt_for_downstream_in_subdir - -export CONDA_ENVIRONMENT=.test-conda-env-py3.yml - -# Avoid slow or complicated tests in downstream projects -export PYTEST_ADDOPTS="-k 'not (slowtest or octave or mpi)'" - -if [[ "$DOWNSTREAM_PROJECT" = "mirgecom" ]]; then - # can't turn off MPI in mirgecom - export CONDA_ENVIRONMENT=conda-env.yml - export CISUPPORT_PARALLEL_PYTEST=no - echo "- mpi4py" >> "$CONDA_ENVIRONMENT" -else - sed -i "/mpi4py/ d" requirements.txt -fi diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21239a687f6be98ce99af79a33fe4a2e28ed25b2..5bdb399ae1fc46628f902b8929dd0f052bf4b451 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: downstream_tests: strategy: matrix: - downstream_project: [grudge, pytential, mirgecom] + downstream_project: [grudge, pytential, mirgecom, mirgecom_examples] name: Tests for downstream project ${{ matrix.downstream_project }} runs-on: ubuntu-latest steps: @@ -138,23 +138,6 @@ jobs: run: | curl -L -O https://tiker.net/ci-support-v0 . ./ci-support-v0 - source .ci/install-downstream.sh - build_py_project_in_conda_env - test_py_project - - mirgecom_examples: - runs-on: ubuntu-latest - name: Examples for downstream project mirgecom - steps: - - uses: actions/checkout@v2 - - name: "Main Script" - env: - DOWNSTREAM_PROJECT: mirgecom - run: | - curl -L -O https://tiker.net/ci-support-v0 - . ./ci-support-v0 - source .ci/install-downstream.sh - build_py_project_in_conda_env - examples/run_examples.sh ./examples + test_downstream "$DOWNSTREAM_PROJECT" # vim: sw=4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b8ef1cb8fa3adc29f1f4a4e058c5dd5d4eab0c6..67ec280c85567990560a62f8a5a8e2d2bbe2d83e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,3 +111,17 @@ Pylint: - python3 except: - tags + +Downstream: + parallel: + matrix: + - DOWNSTREAM_PROJECT: [grudge, pytential, mirgecom, mirgecom_examples] + tags: + - large-node + - "docker-runner" + script: | + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 + test_downstream "$DOWNSTREAM_PROJECT" + +# vim: sw=2