Merge remote-tracking branch 'upstream/master'

nest · Apr 4, 2024 · ab7e910 · ab7e910
2 parents d63f2f4 + 237d8c6
commit ab7e910
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/ci-templates/000_3.7.gitlab-ci.yml b/ci-templates/000_3.7.gitlab-ci.yml
@@ -2,7 +2,8 @@
 ###               3.7rc1                   ###
 ###############################################
 
-Build_Dev:
+
+Build_3.7:
   stage: build
   rules:
     - when: always
@@ -14,7 +15,7 @@ Build_Dev:
         --tag nest/nest-simulator:3.7rc1
         ./src/3.7rc1
     # Test
-    - docker run -i --rm nest/nest-simulator:3.7rc1 bash /opt/test-nest.sh
+    #- docker run -i --rm nest/nest-simulator:3.7rc1 bash /opt/test-nest.sh
     # Deploy
     - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin
     - docker push nest/nest-simulator:3.7rc1

diff --git a/ci-templates/000_dev.gitlab-ci.yml b/ci-templates/000_dev.gitlab-ci.yml
@@ -14,7 +14,7 @@ Build_Dev:
         --tag nest/nest-simulator:dev
         ./src/dev
     # Test
-    - docker run -i --rm nest/nest-simulator:dev bash /opt/test-nest.sh
+    #- docker run -i --rm nest/nest-simulator:dev bash /opt/test-nest.sh
     # Deploy
     - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin
     - docker push nest/nest-simulator:dev

diff --git a/src/3.7rc1/Dockerfile b/src/3.7rc1/Dockerfile
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     freeglut3-dev \
     gosu \
     jq \
+    junitparser \
     less \
     libboost-filesystem-dev libboost-regex-dev libboost-wave-dev \
     libboost-python-dev libboost-program-options-dev libboost-test-dev \
@@ -57,14 +58,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python3-flask-cors \
     python3-h5py \
     python3-ipython \
+    python3-junitparser \
     python3-jupyter-core \
     python3-matplotlib \
     python3-mpi4py \
     python3-nose \
     python3-numpy \
-    python3-pandas \
+    python3-pandas \    
     python3-path \
     python3-pip \
+    python3-pytest \
+    python3-pytest-timeout \
+    python3-pytest-xdist \    
     python3-restrictedpython \
     python3-scipy \
     python3-setuptools \
@@ -104,15 +109,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
           -Dwith-openmp=ON \
           -Dwith-libneurosim=OFF \
           -Dwith-sionlib=OFF \
-          -Dwith-music=ON \ 
+          -Dwith-music='$HOME/.cache/libneurosim.install' \ 
           -Dwith-hdf5=ON \
           ${SRC_PATH}/nest-simulator-${NEST_VERSION} && \
           make && \
           make install && \
     python3 -m pip install --upgrade pip && \
+    python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_testing.txt && \
     python3 -m pip install nest-desktop --pre && \
     python3 -m pip uninstall nestml -y && \
-    python3 -m pip install --upgrade https://github.com/nest/nestml/archive/refs/heads/master.zip  && \
+    python3 -m pip install --upgrade https://github.com/nest/nestml/archive/refs/tags/v7.0.1-rc1.zip  && \
     python3 -m pip install --force-reinstall --upgrade scipy
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh

diff --git a/src/dev/Dockerfile b/src/dev/Dockerfile
@@ -57,14 +57,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python3-flask-cors \
     python3-h5py \
     python3-ipython \
+    python3-junitparser \
     python3-jupyter-core \
     python3-matplotlib \
     python3-mpi4py \
     python3-nose \
     python3-numpy \
-    python3-pandas \
+    python3-pandas \    
     python3-path \
     python3-pip \
+    python3-pytest \
+    python3-pytest-timeout \
+    python3-pytest-xdist \    
     python3-restrictedpython \
     python3-scipy \
     python3-setuptools \
@@ -131,6 +135,7 @@ RUN mkdir ${SRC_PATH}/nest-build && cd $_ && \
 
 # Install NESTML and more
 RUN python3 -m pip install --upgrade pip && \
+    python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_testing.txt && \
     python3 -m pip install nest-desktop --pre && \
     python3 -m pip uninstall nestml -y && \
     python3 -m pip install --upgrade https://github.com/nest/nestml/archive/refs/heads/master.zip