Jupyter docker: incremental build to add esgf-pyclient and xncml to fix Jenkins failure

Jenkinsfile

@@ -10,7 +10,7 @@ pipeline {
     // https://jenkins.io/doc/book/pipeline/syntax/
     agent {
         docker {
-            image "pavics/workflow-tests:221130"
+            image "pavics/workflow-tests:221130-update230403"
             label 'linux && docker'
         }
     }
@@ -136,9 +136,8 @@ Note this is another run, will double the time and no guaranty to have same erro
         ansiColor('xterm')
         timestamps()
         timeout(time: 2, unit: 'HOURS')
-        // trying to keep 2 months worth of history with buffer for manual
-        // build trigger on failed builds or manual test after each production
-        // deployment or test deployment
-        buildDiscarder(logRotator(numToKeepStr: '200'))
+        // trying to keep 3 months worth of history
+        // assuming manual build requests are done on a separated job
+        buildDiscarder(logRotator(numToKeepStr: '100'))
     }
 }

binder/Dockerfile

@@ -1,4 +1,4 @@
-FROM pavics/workflow-tests:221130
+FROM pavics/workflow-tests:221130-update230403
 
 USER root
 

docker/Dockerfile.testing

@@ -1,13 +1,20 @@
 # For testing quickly without having to do a full rebuild.
 
-FROM pavics/workflow-tests:220728
+FROM pavics/workflow-tests:221130
+
+# To avoid error "PROJ: proj_create_from_database: Open of /opt/conda/envs/birdy/share/proj failed"
+# This simulates a real `conda activate birdy`.
+ENV PROJ_DATA="/opt/conda/envs/birdy/share/proj"
 
 USER root
 
 # Use 'update' for existing and 'install' for new package.
 # Keep same channel ordering to not revert anything.
+# esgf-pyclient for pavics-sdi esgf-dap.ipynb, PR https://github.com/Ouranosinc/pavics-sdi/pull/269
+# xncml for gen_catalog refactoring, PR https://github.com/Ouranosinc/pavics-vdb/pull/46
 RUN umask 0000 \
-    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyston -c pyviz/label/dev -c defaults -n birdy geopy
+    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyston -c pyviz/label/dev -c defaults -n birdy esgf-pyclient \
+    && pip install xncml
 #    && pip uninstall -y ravenpy \
 #    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy ravenpy aiohttp
 

launchcontainer

@@ -1,7 +1,7 @@
 #!/bin/sh -x
 
 if [ -z "$DOCKER_IMAGE" ]; then
-    DOCKER_IMAGE="pavics/workflow-tests:221130"
+    DOCKER_IMAGE="pavics/workflow-tests:221130-update230403"
 fi
 
 if [ -z "$CONTAINER_NAME" ]; then

launchnotebook

@@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then
 fi
 
 if [ -z "$DOCKER_IMAGE" ]; then
-    DOCKER_IMAGE="pavics/workflow-tests:221130"
+    DOCKER_IMAGE="pavics/workflow-tests:221130-update230403"
 fi
 
 if [ -z "$CONTAINER_NAME" ]; then