Skip to content

Commit 6b07eb0

Browse files
authored
DAS-2397: Adds nsidc-smap regression test suite. (#204)
1 parent ff199b4 commit 6b07eb0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1311
-33
lines changed

.github/workflows/build-all-images.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ jobs:
3232
image: "nsidc-icesat2"
3333
notebook: "NSIDC-ICESAT2_Regression.ipynb"
3434
shared-utils: "true"
35+
-
36+
image: "nsidc-smap"
37+
notebook: "nsidc-smap_Regression.ipynb"
38+
shared-utils: "true"
3539
-
3640
image: "regridder"
3741
notebook: "Regridder_Regression.ipynb"

.github/workflows/notebook-test-suite.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ on:
7575
- harmony-regression
7676
- sambah
7777
- nsidc-icesat2
78+
- nsidc-smap
7879

7980
docker-image-tag:
8081
description: "Optional Docker image tag to use for the tests"

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ versioning. Rather than a static releases, this repository contains of a number
55
of regression tests that are each semi-independent. This CHANGELOG file should be used
66
to document pull requests to this repository.
77

8+
## 2025-08-21 ([204](https://github.com/nasa/harmony-regression-tests/pull/204))
9+
10+
### Added
11+
12+
- Adds regression tests and support configuration for `nsidc-smap` test suite.
13+
814
## 2025-08-14 ([#202](https://github.com/nasa/harmony-regression-tests/pull/202))
915

1016
### Changed

README.md

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -132,39 +132,50 @@ environment before installing from the environment.yml.
132132
with a Harmony service and add it to the `all` list so that it will be run when
133133
the associated Harmony service or Harmony server is deployed.
134134

135-
With this in place, the new test suite should be able to be built and run:
136-
137-
```bash
138-
EDL_USER=...
139-
EDL_PASSWORD=...
140-
HARMONY_HOST_URL=https://harmony.sit.earthdata.nasa.gov # Or UAT or production
141-
cd test
142-
make <new-suite-name>-image
143-
./run_notebooks.sh <new-suite-name>
144-
```
145-
146-
After this, the test suite will need to be integrated with the GitHub workflow
135+
1. With theses changes in place, the new test suite should be able to be built and run:
136+
```sh
137+
EDL_USER=[use yours...]
138+
EDL_PASSWORD=[use yours...]
139+
HARMONY_HOST_URL=https://harmony.sit.earthdata.nasa.gov # Or UAT or production
140+
cd test
141+
make <new-suite-name>-image
142+
./run_notebooks.sh <new-suite-name>
143+
```
144+
145+
1. After this, the test suite will need to be integrated with the GitHub workflow
147146
to create a new version of the test image any time the related `version.txt`
148147
file is updated. To do so, simply add a new target to the
149148
[build-all-images.yml](https://github.com/nasa/harmony-regression-tests/blob/main/.github/workflows/build-all-images.yml) workflow in the `.github/workflows` directory:
150149

151-
```yaml
152-
-
153-
image: <new-suite-name>
154-
notebook: <new-notebook-name>
155-
```
156-
157-
The above is the basic structure for adding a new image to the CI/CD. An
158-
additional option, `shared-utils`, defaults to off, but can be over-ridden as
159-
it is for the nsidc-icesat2 image. `shared-utils` controls the addition of the
160-
`tests/shared_utils` directory into your image.
150+
```yaml
151+
-
152+
image: <new-suite-name>
153+
notebook: <new-notebook-name>
154+
shared-utils: "true"
155+
```
161156
162-
``` yaml
163-
-
164-
image: "nsidc-icesat2"
165-
notebook: "NSIDC-ICESAT2_Regression.ipynb"
166-
shared-utils: "true"
167-
```
157+
1. If your test suite is for a new service. Meaning it has an entry on Harmony's [/service-image-tag](https://harmony.earthdata.nasa.gov/service-image-tag) endpoint you should add it to the:
158+
```yaml
159+
on:
160+
repository_dispatch:
161+
types:
162+
- all
163+
- batchee
164+
- your-new-service
165+
```
166+
list in the [notebook-test-suite.yml](https://github.com/nasa/harmony-regression-tests/blob/main/.github/workflows/notebook-test-suite.yml)
167+
168+
1. If you want to trigger your tests by hand on GitHub, add your test name to the:
169+
```yaml
170+
on:
171+
workflow_dispatch:
172+
service-name:
173+
options:
174+
- all
175+
- batchee
176+
- your-new-service
177+
```
178+
list of the [notebook-test-suite.yml](https://github.com/nasa/harmony-regression-tests/blob/main/.github/workflows/notebook-test-suite.yml)
168179
169180
## Test suite contents:
170181
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
{
2-
"all": "harmony,harmony-regression,geoloco,hga,regridder,hoss,variable-subsetter,hybig,imagenator,net2cog,smap-l2-gridder,subset-band-name,swath-projector,nsidc-icesat2,trajectory-subsetter,sambah,opera-rtc-s1-browse",
2+
"all": "harmony,harmony-regression,geoloco,hga,regridder,hoss,variable-subsetter,hybig,imagenator,net2cog,smap-l2-gridder,subset-band-name,swath-projector,nsidc-icesat2,nsidc-smap,trajectory-subsetter,sambah,opera-rtc-s1-browse",
33
"batchee": "sambah",
44
"filtering": "imagenator",
55
"geoloco": "geoloco",
66
"giovanni-adapter": "TBD",
77
"harmony-gdal-adapter": "hga",
88
"harmony-regridder": "regridder",
99
"harmony-service-example": "harmony-regression",
10-
"harmony-smap-l2-gridder": "smap-l2-gridder",
10+
"harmony-smap-l2-gridder": "nsidc-smap,smap-l2-gridder",
1111
"hoss": "hoss,variable-subsetter",
1212
"hybig": "hybig,opera-rtc-s1-browse,imagenator",
1313
"imagenator": "imagenator",
14-
"net2cog": "net2cog,imagenator",
14+
"net2cog": "net2cog,nsidc-smap,imagenator",
1515
"opera-rtc-s1-browse": "opera-rtc-s1-browse",
1616
"podaac-concise": "sambah",
1717
"podaac-l2-subsetter": "sambah",
1818
"query-cmr": "variable-subsetter",
1919
"sds-maskfill": "hoss",
2020
"stitchee": "sambah",
2121
"subset-band-name": "subset-band-name",
22-
"swath-projector": "swath-projector,imagenator",
23-
"trajectory-subsetter": "nsidc-icesat2,trajectory-subsetter",
22+
"swath-projector": "swath-projector,nsidc-smap,imagenator",
23+
"trajectory-subsetter": "nsidc-icesat2,nsidc-smap,trajectory-subsetter",
2424
"harmony": "harmony",
2525
"harmony-regression": "harmony-regression",
2626
"nsidc-icesat2": "nsidc-icesat2",
27+
"nsidc-smap": "nsidc-smap",
2728
"sambah": "sambah"
2829
}

script/test-in-bamboo.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ all_tests=(
5252
imagenator
5353
net2cog
5454
nsidc-icesat2
55+
nsidc-smap
5556
opera-rtc-s1-browse
5657
regridder
5758
sambah

test/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ nsidc-icesat2-image: Dockerfile nsidc-icesat2/environment.yaml
2929
--build-arg notebook=NSIDC-ICESAT2_Regression.ipynb --build-arg sub_dir=nsidc-icesat2 \
3030
--build-arg shared_utils=true .
3131

32+
nsidc-smap-image: Dockerfile nsidc-smap/environment.yaml
33+
docker build -t ghcr.io/nasa/regression-tests-nsidc-smap:latest -f ./Dockerfile \
34+
--build-arg notebook=nsidc-smap_Regression.ipynb --build-arg sub_dir=nsidc-smap \
35+
--build-arg shared_utils=true .
36+
3237
regridder-image: Dockerfile regridder/environment.yaml
3338
docker build -t ghcr.io/nasa/regression-tests-regridder:latest -f ./Dockerfile \
3439
--build-arg notebook=Regridder_Regression.ipynb --build-arg sub_dir=regridder \
@@ -82,6 +87,7 @@ images: harmony-image \
8287
hybig-image \
8388
imagenator-image \
8489
nsidc-icesat2-image \
90+
nsidc-smap-image \
8591
regridder-image \
8692
smap-l2-gridder-image \
8793
subset-band-name-image \
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<kml xmlns="http://www.opengis.net/kml/2.2"><Document>
2+
<Placemark>
3+
<ExtendedData></ExtendedData>
4+
<Polygon>
5+
<outerBoundaryIs>
6+
<LinearRing><coordinates>-93.33515499433173,44.47025508433279
7+
-93.33515499433173,30.315484354637036
8+
-77.02407154294654,30.315484354637036
9+
-77.02407154294654,44.47025508433279
10+
-93.33515499433173,44.47025508433279</coordinates></LinearRing></outerBoundaryIs></Polygon></Placemark></Document></kml>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"coordinates":[[[8.20889625972029,49.1338401017081],[1.743012122049322,51.27624895999446],[-5.111555322809551,48.55802129260826],[-1.9547267837421032,43.46597834514631],[3.4983940574298344,42.08322300391913],[7.307299566010869,45.15784094123768],[6.196119692442579,46.347898754742886],[8.20889625972029,49.1338401017081]]],"type":"Polygon"}}]}
2.15 KB
Binary file not shown.

0 commit comments

Comments
 (0)