Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix autoamtic testing #221

Merged
merged 10 commits into from
Mar 26, 2024
Merged

Fix autoamtic testing #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
29adbb2
Merge build and deploy to fix deploy problems
steffengraber Feb 9, 2024
3d52979
Merge remote-tracking branch 'upstream/master'
steffengraber Mar 7, 2024
e1cfa85
Merge remote-tracking branch 'upstream/master'
steffengraber Mar 8, 2024
d63f2f4
Merge remote-tracking branch 'upstream/master'
steffengraber Mar 26, 2024
7a99f1e
Add Music to NEST build
steffengraber Mar 26, 2024
c2b5761
Add test requirement
steffengraber Mar 26, 2024
e5bde0b
Add testing requirements
steffengraber Mar 26, 2024
c9782ff
Choose test requirements from file
steffengraber Mar 26, 2024
648ba97
Apt install testing requirements
steffengraber Mar 26, 2024
096e35e
Deactivate Tests
steffengraber Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci-templates/000_3.7.gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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
Expand Down
2 changes: 1 addition & 1 deletion ci-templates/000_dev.gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions src/3.7rc1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -104,15 +109,15 @@ 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 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
Expand Down
6 changes: 5 additions & 1 deletion src/dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down