Merge pull request #21 from pymor/ci_update

CI improvements

Author: renefritze

.binder/Dockerfile

@@ -5,7 +5,7 @@
 # the container, local dev needs it in path from mounted src
 # we trick docker into fulfilling both roles via a conditional ONBUILD
 # if you want to use the local dev setup, see docker/docker-compose.yml
-ARG BASE=pymor/testing_py3.9:133249e1ace233311c1dbcfc2e70b3f8624058a8
+ARG BASE=pymor/testing_py3.9:41fca6eecc2a539f73a04be0255f4dc44edc9f43
 ARG BUILD_ENV=binder
 
 FROM $BASE as image_binder
@@ -26,13 +26,11 @@ ARG NB_UID
 ARG PYMOR_JUPYTER_TOKEN
 
 USER root
-RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
-    chown -R ${NB_USER} /home/pymor /src/ && \
-    apt update && \
-    apt install -y libtbb-dev
+# RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
+#     chown -R ${NB_USER} /home/pymor /src/
 
-RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
-USER ${NB_USER}
+# # RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
+# USER ${NB_USER}
 
 ENV JUPYTER_TOKEN=${PYMOR_JUPYTER_TOKEN} \
     USER=${NB_USER} \

.binder/Dockerfile.in

@@ -26,13 +26,11 @@ ARG NB_UID
 ARG PYMOR_JUPYTER_TOKEN
 
 USER root
-RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
-    chown -R ${NB_USER} /home/pymor /src/ && \
-    apt update && \
-    apt install -y libtbb-dev
+# RUN useradd -d /home/pymor --shell /bin/bash -u ${NB_UID} -o -c "" -m ${NB_USER} && \
+#     chown -R ${NB_USER} /home/pymor /src/
 
-RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
-USER ${NB_USER}
+# # RUN bash -c "([[ -e /src/setup.py ]] && pip install /src || echo 'no install needed') && pip install jupyter"
+# USER ${NB_USER}
 
 ENV JUPYTER_TOKEN=${PYMOR_JUPYTER_TOKEN} \
     USER=${NB_USER} \

.ci/azure-pipelines.yml

@@ -1,23 +1,18 @@
-pool:
-  vmImage: 'ubuntu-20.04'
-
-strategy:
-  matrix:
-    9.3_3.7:
-      containerImage: pymor/dealii_py3.7:8b53a0c0ef5397576c1f9800e5e0ad3008536ea8
-    9.3_3.8:
-      containerImage: pymor/dealii_py3.8:8b53a0c0ef5397576c1f9800e5e0ad3008536ea8
-    9.3_3.9:
-      containerImage: pymor/dealii_py3.9:8b53a0c0ef5397576c1f9800e5e0ad3008536ea8
-
 schedules:
 - cron: "0 12 * * 1"
   displayName: Weekly build
   branches:
     include:
       - main
-container: $[ variables['containerImage'] ]
 
-steps:
-- script: ./.ci/pytest.bash
-- script: ./.ci/wheel.bash
+jobs:
+  - template: job-template.yml
+    parameters:
+      script: pytest
+  - template: job-template.yml
+    parameters:
+      script: wheel
+  # this currently fails on azure, but works locally
+  # - template: job-template.yml
+  #   parameters:
+  #     script: install

.ci/install.bash

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+set -x
+
+BASE_DIR="$(cd "$(dirname ${BASH_SOURCE[0]})" ; cd ../ ; pwd -P )"
+
+source ${BASE_DIR}/.ci/common_setup.bash
+
+python -m pip install .
+python -m pip uninstall -y pymor_dealii
+
+python -m pip install -e .
+

.ci/job-template.yml

@@ -0,0 +1,22 @@
+
+parameters:
+  name: script
+
+jobs:
+- job: ${{ parameters.script }}
+  pool:
+    vmImage: 'ubuntu-20.04'
+
+  strategy:
+    matrix:
+      9.3_3.7:
+        containerImage: pymor/dealii_py3.7:47f2bf40dd49a64292e482b59fe6631101fdcc2b
+      9.3_3.8:
+        containerImage: pymor/dealii_py3.8:47f2bf40dd49a64292e482b59fe6631101fdcc2b
+      9.3_3.9:
+        containerImage: pymor/dealii_py3.9:47f2bf40dd49a64292e482b59fe6631101fdcc2b
+
+  container: $[ variables['containerImage'] ]
+
+  steps:
+  - script: ./.ci/${{ parameters.script }}.bash

.env

@@ -1,4 +1,4 @@
 DOCKER_BASE_PYTHON=3.9
-PYPI_MIRROR_TAG=133249e1ace233311c1dbcfc2e70b3f8624058a8
-CI_IMAGE_TAG=133249e1ace233311c1dbcfc2e70b3f8624058a8
+PYPI_MIRROR_TAG=41fca6eecc2a539f73a04be0255f4dc44edc9f43
+CI_IMAGE_TAG=41fca6eecc2a539f73a04be0255f4dc44edc9f43
 PYMOR_TEST_OS=debian_buster