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.

Sign up for GitHub

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

TRADE-187: Add tests for SAMBAH #116

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open

TRADE-187: Add tests for SAMBAH #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a0c2d75
add `sambah-image` to Makefile
danielfromearth Nov 13, 2024
ce98d43
add "sambah" image to list in run_notebooks.sh
danielfromearth Nov 13, 2024
5b42597
add "sambah" image to list in test-in-bamboo.sh
danielfromearth Nov 13, 2024
68011d4
add "sambah" image to build-all-images.yml GitHub Actions workflow
danielfromearth Nov 13, 2024
0831cde
merge commit from different branch
danielfromearth Nov 13, 2024
e608ec7
update environment.yaml
danielfromearth Nov 13, 2024
20e75a8
fix variable name mismatch
danielfromearth Nov 13, 2024
49ae4e0
merge cherry pick commit
danielfromearth Nov 13, 2024
81f5247
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 15, 2024
0cbd763
update to use conditionals for test suites and fix environment mutabi…
danielfromearth Nov 15, 2024
9da8a0b
track and add reference data files
danielfromearth Nov 18, 2024
dda0f1b
rename local utilities module and remove shared utils
danielfromearth Nov 15, 2024
702ecf9
update notebook to use shared_utils
danielfromearth Nov 15, 2024
93373b4
clean up imports
danielfromearth Nov 18, 2024
fe400a7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 18, 2024
7537034
update comments and markdown text
danielfromearth Nov 18, 2024
f741fbe
fix notebook source formatting
danielfromearth Nov 18, 2024
56a17e8
Merge pull request #115 from danielfromearth/TRADE187-sambah-tests
danielfromearth Nov 18, 2024
d5b4a2d
Merge branch 'main' into trade-187-sambah-tests
danielfromearth Dec 5, 2024
e73815f
add "sambah" to services_tests_config_prod.json
danielfromearth Dec 9, 2024
7b18d77
add "sambah" to services_tests_config_uat.json
danielfromearth Dec 9, 2024
456073d
Update services_tests_config_prod.json
danielfromearth Dec 9, 2024
a88cb28
Update services_tests_config_uat.json
danielfromearth Dec 9, 2024
7969125
trade-187: include share-util in docker images
flamingbear Dec 9, 2024
43d66c3
trade-187: recover deleted files.
flamingbear Dec 9, 2024
254c70d
trade-187: reword module comment to specify sambah
flamingbear Dec 10, 2024
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
4 changes: 4 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
test/nsidc-icesat2/reference_files/*.h5 filter=lfs diff=lfs merge=lfs -text
test/subset-band-name/reference_data/*.hdf filter=lfs diff=lfs merge=lfs -text
test/sambah/reference_files/all_data.nc4 filter=lfs diff=lfs merge=lfs -text
test/sambah/reference_files/spatial_only.nc4 filter=lfs diff=lfs merge=lfs -text
test/sambah/reference_files/temp_var_bbox.nc4 filter=lfs diff=lfs merge=lfs -text
test/sambah/reference_files/var_only.nc4 filter=lfs diff=lfs merge=lfs -text
test/opera-rtc-s1-browse/reference_data/*.png filter=lfs diff=lfs merge=lfs -text
5 changes: 5 additions & 0 deletions .github/workflows/build-all-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ jobs:
-
image: "net2cog"
notebook: "net2cog_Regression.ipynb"
-
image: "sambah"
notebook: "SAMBAH_Regression.ipynb"
shared-utils: "true"
lfs: "true"
flamingbear marked this conversation as resolved.
Show resolved Hide resolved
-
image: "opera-rtc-s1-browse"
notebook: "opera-rtc-s1-browse_Regression.ipynb"
Expand Down
6 changes: 3 additions & 3 deletions config/services_tests_config_prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"all": "harmony,harmony-regression,geoloco,hga,n2z,regridder,hoss,hybig,net2cog,subset-band-name,swath-projector,nsidc-icesat2,trajectory-subsetter,opera-rtc-s1-browse",
"batchee": "TBD",
"all": "harmony,harmony-regression,geoloco,hga,n2z,regridder,hoss,hybig,net2cog,subset-band-name,swath-projector,nsidc-icesat2,trajectory-subsetter,sambah,opera-rtc-s1-browse",
"batchee": "sambah",
"geoloco": "geoloco",
"giovanni-adapter": "TBD",
"harmony-gdal-adapter": "hga",
Expand All @@ -14,7 +14,7 @@
"podaac-l2-subsetter": "TBD",
"query-cmr": "geoloco",
"sds-maskfill": "TBD",
"stitchee": "TBD",
"stitchee": "sambah",
"subset-band-name": "subset-band-name",
"swath-projector": "swath-projector",
"trajectory-subsetter": "nsidc-icesat2,trajectory-subsetter",
Expand Down
6 changes: 3 additions & 3 deletions config/services_tests_config_uat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"all": "harmony,harmony-regression,geoloco,hga,n2z,regridder,hoss,variable-subsetter,hybig,net2cog,subset-band-name,swath-projector,nsidc-icesat2,trajectory-subsetter,opera-rtc-s1-browse",
"batchee": "TBD",
"all": "harmony,harmony-regression,geoloco,hga,n2z,regridder,hoss,variable-subsetter,hybig,net2cog,subset-band-name,swath-projector,nsidc-icesat2,trajectory-subsetter,sambah,opera-rtc-s1-browse",
"batchee": "sambah",
"geoloco": "geoloco",
"giovanni-adapter": "TBD",
"harmony-gdal-adapter": "hga",
Expand All @@ -14,7 +14,7 @@
"podaac-l2-subsetter": "TBD",
"query-cmr": "variable-subsetter",
"sds-maskfill": "TBD",
"stitchee": "TBD",
"stitchee": "sambah",
"subset-band-name": "subset-band-name",
"swath-projector": "swath-projector",
"trajectory-subsetter": "nsidc-icesat2,trajectory-subsetter",
Expand Down
2 changes: 1 addition & 1 deletion script/test-in-bamboo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ echo "harmony host url: ${harmony_host_url}"
## e.g. if REGRESSION_TESTS_N2Z_IMAGE environment was set, the value would be used instead of the default.

image_names=()
all_tests=(harmony harmony-regression hoss hga n2z nsidc-icesat2 swath-projector trajectory-subsetter variable-subsetter regridder hybig geoloco net2cog subset-band-name opera-rtc-s1-browse)
all_tests=(harmony harmony-regression hoss hga n2z nsidc-icesat2 swath-projector trajectory-subsetter variable-subsetter regridder hybig geoloco net2cog subset-band-name sambah opera-rtc-s1-browse)
for image in "${all_tests[@]}"; do
image_names+=($(image_name "$image" true))
done
Expand Down
6 changes: 6 additions & 0 deletions test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ net2cog-image: Dockerfile net2cog/environment.yaml
docker build -t ghcr.io/nasa/regression-tests-net2cog:latest -f ./Dockerfile \
--build-arg notebook=net2cog_Regression.ipynb --build-arg sub_dir=net2cog .

sambah-image: Dockerfile sambah/environment.yaml
docker build -t ghcr.io/nasa/regression-tests-sambah:latest -f ./Dockerfile \
--build-arg notebook=SAMBAH_Regression.ipynb --build-arg sub_dir=sambah \
--build-arg shared_utils=true .

opera-rtc-s1-browse-image: Dockerfile opera-rtc-s1-browse/environment.yaml
docker build -t ghcr.io/nasa/regression-tests-opera-rtc-s1-browse:latest -f ./Dockerfile \
--build-arg notebook=opera-rtc-s1-browse_Regression.ipynb --build-arg sub_dir=opera-rtc-s1-browse .
Expand All @@ -75,4 +80,5 @@ images: harmony-image \
variable-subsetter-image \
geoloco-image \
net2cog-image \
sambah-image \
opera-rtc-s1-browse-image
2 changes: 1 addition & 1 deletion test/run_notebooks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ echo "Running regression tests"

# Specify the test images to run, by default all built by the Makefile. If
# the script is invoked with a list of images, only run those.
all_images=(harmony harmony-regression hoss hga n2z nsidc-icesat2 swath-projector trajectory-subsetter variable-subsetter regridder hybig geoloco net2cog subset-band-name opera-rtc-s1-browse)
all_images=(harmony harmony-regression hoss hga n2z nsidc-icesat2 swath-projector trajectory-subsetter variable-subsetter regridder hybig geoloco net2cog subset-band-name sambah opera-rtc-s1-browse)
specified_images=()
# Parse command line arguments
while [[ $# -gt 0 ]]; do
Expand Down
Loading