diff --git a/Jenkinsfile b/Jenkinsfile index c9fff991..6c2f2c8f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { // https://jenkins.io/doc/book/pipeline/syntax/ agent { docker { - image "pavics/workflow-tests:220121" + image "pavics/workflow-tests:220401" label 'linux && docker' } } diff --git a/binder/Dockerfile b/binder/Dockerfile index 37b908e7..c7cc9ea8 100644 --- a/binder/Dockerfile +++ b/binder/Dockerfile @@ -1,4 +1,4 @@ -FROM pavics/workflow-tests:220121 +FROM pavics/workflow-tests:220401 USER root diff --git a/docker/Dockerfile b/docker/Dockerfile index 903082e7..6c19bf04 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -93,7 +93,8 @@ RUN wget https://raw.githubusercontent.com/jupyter/docker-stacks/$DOCKER_STACKS_ wget https://raw.githubusercontent.com/jupyter/docker-stacks/$DOCKER_STACKS_COMMIT/base-notebook/jupyter_notebook_config.py --output-document /etc/jupyter/jupyter_notebook_config.py && \ chmod a+rx /usr/local/bin/start.sh /usr/local/bin/start-singleuser.sh /usr/local/bin/start-notebook.sh /usr/local/bin/fix-permissions && \ chmod a+r /etc/jupyter/jupyter_notebook_config.py && \ - mkdir /notebook_dir && chown jenkins /notebook_dir + mkdir /notebook_dir && chown jenkins /notebook_dir && \ + chmod a+rwX -R /opt/conda/envs/birdy/fonts # problem running start-notebook.sh when being root # the jupyter/base-notebook image also do not default to root user so we do the same here diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing index dab68d74..ff126fc7 100644 --- a/docker/Dockerfile.testing +++ b/docker/Dockerfile.testing @@ -1,13 +1,17 @@ # For testing quickly without having to do a full rebuild. -FROM pavics/workflow-tests:211221 +FROM pavics/workflow-tests:220201 USER root # Use 'update' for existing and 'install' for new package. # Keep same channel ordering to not revert anything. +# Pin dask and distributed for slow PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb. +# Pin cf_xarray for slow WPS_example.ipynb. RUN umask 0000 \ - && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy "shapely<=1.7.1" "bokeh<=2.3.3" + && conda install -c conda-forge mamba -n base \ + && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy "dask<=2022.1.0" "distributed<=2022.1.0" "cf_xarray<=0.6.3" \ + && conda remove mamba -n base # && pip uninstall -y ravenpy \ # && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy ravenpy aiohttp diff --git a/docker/environment.yml b/docker/environment.yml index 9ab608dc..62a156c7 100644 --- a/docker/environment.yml +++ b/docker/environment.yml @@ -21,6 +21,15 @@ dependencies: - xclim >= 0.32.1 - ravenpy >= 0.7.8 + # Pin dask and distributed for slow PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb. + # Same as in commit https://github.com/bird-house/finch/pull/226/commits/7bf4a7e1bcb12bc88d15bdcbbd484e81106be67c + # See issue https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/issues/100 + - dask <= 2022.1.0 + - distributed <= 2022.1.0 + + # Pin cf_xarray for slow WPS_example.ipynb. + - cf_xarray<=0.6.3 + - matplotlib # - xarray # from xclim and ravenpy # - numpy # from xclim and ravenpy @@ -88,6 +97,7 @@ dependencies: - s3fs # - shapely # from ravenpy # PIN shapely due to notebook failure + # See issue https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/issues/99 # PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb: # /opt/conda/envs/birdy/lib/python3.7/site-packages/shapely/geometry/base.py in array_interface_base(self) # 324 "removed in Shapely 2.0.", @@ -173,6 +183,8 @@ dependencies: - scp - selenium - geckodriver + - xlrd + - pre-commit # for pip packages - pip - pip: diff --git a/launchcontainer b/launchcontainer index e4f0a959..0b1a1338 100755 --- a/launchcontainer +++ b/launchcontainer @@ -1,7 +1,7 @@ #!/bin/sh -x if [ -z "$DOCKER_IMAGE" ]; then - DOCKER_IMAGE="pavics/workflow-tests:220121" + DOCKER_IMAGE="pavics/workflow-tests:220401" fi if [ -z "$CONTAINER_NAME" ]; then diff --git a/launchnotebook b/launchnotebook index a6a8c52f..b6e60684 100755 --- a/launchnotebook +++ b/launchnotebook @@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then fi if [ -z "$DOCKER_IMAGE" ]; then - DOCKER_IMAGE="pavics/workflow-tests:220121" + DOCKER_IMAGE="pavics/workflow-tests:220401" fi if [ -z "$CONTAINER_NAME" ]; then