From 19f3b42a02578157765414c3ac173e7b01917977 Mon Sep 17 00:00:00 2001 From: Michael Campbell Date: Mon, 14 Nov 2022 01:01:23 -0600 Subject: [PATCH 1/5] Update mirgecom downstream testing to use integrated test runner. --- .github/workflows/ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84f380b9c..b5b3d6b2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,9 +132,12 @@ jobs: build_py_project_in_conda_env if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then - # Test main branch - # Only test examples, not pytest tests, as those take too much time. - examples/run_examples.sh ./examples + # Test main (and production) branch + # --all: + # Examples - runs mirgecom examples + # LazyAccuracy - checks lazy vs. eager numerical results + # Production - runs mirgecom's production/prediction tests + scripts/run_integrated_tests.sh --all else test_py_project fi From e564caed95e27fe7193179a23cb1fff891628774 Mon Sep 17 00:00:00 2001 From: Michael Campbell Date: Mon, 14 Nov 2022 01:05:01 -0600 Subject: [PATCH 2/5] Spell the wrapper correctly. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5b3d6b2f..b00c1fff7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,7 +137,7 @@ jobs: # Examples - runs mirgecom examples # LazyAccuracy - checks lazy vs. eager numerical results # Production - runs mirgecom's production/prediction tests - scripts/run_integrated_tests.sh --all + scripts/run-integrated-tests.sh --all else test_py_project fi From ed32c390f606b8e11f2b4f07b87566db95c0c87b Mon Sep 17 00:00:00 2001 From: Michael Campbell Date: Mon, 14 Nov 2022 01:52:55 -0600 Subject: [PATCH 3/5] Hack a work-around to production testing --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b00c1fff7..293aad67e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,6 +137,7 @@ jobs: # Examples - runs mirgecom examples # LazyAccuracy - checks lazy vs. eager numerical results # Production - runs mirgecom's production/prediction tests + git stash # FIXME: Sync/Marry requirements.txt@production w/local scripts/run-integrated-tests.sh --all else test_py_project From 5896111dd6037ec33fd9ba658e983030a44dcad0 Mon Sep 17 00:00:00 2001 From: Michael Campbell Date: Mon, 14 Nov 2022 12:24:50 -0600 Subject: [PATCH 4/5] Disable production testing (for now). --- .github/workflows/ci.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 293aad67e..136439ed3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,13 +132,17 @@ jobs: build_py_project_in_conda_env if test "$DOWNSTREAM_PROJECT" = "mirgecom"; then - # Test main (and production) branch - # --all: - # Examples - runs mirgecom examples - # LazyAccuracy - checks lazy vs. eager numerical results - # Production - runs mirgecom's production/prediction tests - git stash # FIXME: Sync/Marry requirements.txt@production w/local - scripts/run-integrated-tests.sh --all + # Test main ~~(and production) branch~~ + # + # -a|--all: runs all of examples, lazyaccuracy, production + # -e|--examples: Examples - runs mirgecom examples + # -l|--lazy-accuracy: LazyAccuracy - checks lazy vs. eager numerical results + # -p|--production: Production - runs mirgecom's production/prediction tests + # + # FIXME: Production testing stomps on `requirements.txt` + # git stash # FIXME: Sync/Marry requirements.txt@production w/local + # scripts/run-integrated-tests --all + scripts/run-integrated-tests.sh --lazy --examples else test_py_project fi From 05b9ef2daa9f2ad972277b8e7fab0046ba688af8 Mon Sep 17 00:00:00 2001 From: Michael Campbell Date: Mon, 14 Nov 2022 12:35:29 -0600 Subject: [PATCH 5/5] Spell options correctly. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 136439ed3..54a1ccd4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,7 +142,7 @@ jobs: # FIXME: Production testing stomps on `requirements.txt` # git stash # FIXME: Sync/Marry requirements.txt@production w/local # scripts/run-integrated-tests --all - scripts/run-integrated-tests.sh --lazy --examples + scripts/run-integrated-tests.sh --lazy-accuracy --examples else test_py_project fi