Skip to content

Commit

Permalink
Update CI to use new containers
Browse files Browse the repository at this point in the history
  • Loading branch information
remi-braun committed Dec 4, 2023
1 parent 765346f commit 2b07aad
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 9 deletions.
43 changes: 35 additions & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ stages:
- weekly_tests

variables:
EEO_DEPS: $REGISTRY_GITLAB/extracteo/extracteo_deps
EO_CONTAINER: $REGISTRY_GITLAB/eo-containers/python
EO_CONTAINER: $REGISTRY_GITLAB/eo-containers
EOREADER_CHANGES: eoreader/**/[^_]*.{py,xml}

lint:
Expand All @@ -24,7 +23,7 @@ lint:

# Test with data on local disk
pytest:
image: $EEO_DEPS:latest
image: $EO_CONTAINER:geo_latest
stage: test
variables:
CI_EOREADER_USE_S3: "0"
Expand Down Expand Up @@ -59,7 +58,7 @@ pytest:
# Test with data on S3
# TODO: create S3-specific CI ?
pytest_s3:
image: $EEO_DEPS:latest
image: $EO_CONTAINER:geo_latest
stage: test
variables:
CI_EOREADER_USE_S3: "1"
Expand Down Expand Up @@ -93,7 +92,7 @@ pytest_s3:

# Test SNAP with SNAP
pytest_end_to_end:
image: $EEO_DEPS:latest
image: $EO_CONTAINER:geo_latest
stage: test
variables:
EOREADER_USE_DASK: "1"
Expand All @@ -119,7 +118,7 @@ pytest_end_to_end:
when: always

pytest_end_to_end310:
image: $EEO_DEPS:310
image: $EO_CONTAINER:geo_310
stage: test
variables:
# Use Dask for python 3.10
Expand Down Expand Up @@ -147,7 +146,7 @@ pytest_end_to_end310:
needs: [ "pytest_end_to_end" ]

pytest_end_to_end311:
image: $EEO_DEPS:311
image: $EO_CONTAINER:geo_311
stage: test
variables:
# Use Dask for python 3.11
Expand All @@ -174,8 +173,36 @@ pytest_end_to_end311:
when: always
needs: [ "pytest_end_to_end310" ]

pytest_end_to_end312:
image: $EO_CONTAINER:geo_312
stage: test
variables:
# Use Dask for python 3.11
EOREADER_USE_DASK: "1"
before_script:
- python -m pip install --upgrade pip
- pip install --ignore-installed PyYAML
- pip install pytest coverage pytest-cov pylint
- pip install -e .
script:
- python -m pytest -v --durations=0 --cov-report term --cov-report html:${CI_PROJECT_DIR}/cov_e2e.html --cov=eoreader --cov-config=.coveragerc CI/SCRIPTS_SNAP/test_all_sat_end_to_end_on_disk.py --log-cli-level DEBUG --capture=tee-sys
artifacts:
paths:
- ${CI_PROJECT_DIR}/cov_e2e.html
coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
tags:
- sertit
- linux
- high_memory
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_NAME == "END_TO_END"'
when: always
- if: $CI_COMMIT_TAG
when: always
needs: [ "pytest_end_to_end311" ]

tox-linux-3.9:on-schedule:
image: $EO_CONTAINER:3.9
image: $EO_CONTAINER:geo_39
stage: weekly_tests
before_script:
- python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dicttoxml

# Paths
validators
cloudpathlib>=0.10.0
cloudpathlib[s3]>=0.10.0

# Raster libs
scipy
Expand Down

0 comments on commit 2b07aad

Please sign in to comment.