Skip to content

Commit

Permalink
Fix and update Docker auto testing.
Browse files Browse the repository at this point in the history
  • Loading branch information
rdzman committed Jun 5, 2024
1 parent 0d9f3c3 commit bc4b51e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
5 changes: 3 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# matpower-extras from GitHub
# github - (default) to clone matpower and matpower-extras from GitHub
# BRANCH=<branch or tag> to specify the branch or tag for GitHub checkouts
# (default is 'master')
#
# docker build -f docker/Dockerfile-matpower -t matpower/matpower:latest .
# docker build --build-arg BRANCH=7.1 --build-arg BASE_TAG=5.2.0 -f docker/Dockerfile-matpower -t matpower/matpower:7.1-oct-5.2.0 .
Expand Down Expand Up @@ -35,7 +36,7 @@ WORKDIR /tmp
FROM base AS matpower_local
ONBUILD ARG MP_SRC
ONBUILD ARG BRANCH
ONBUILD COPY ./docker/matpower_docker_tests/matpower_docker_tests_7.sh /usr/local/bin/matpower_docker_tests.sh
ONBUILD COPY ./docker/matpower_docker_tests/matpower_docker_tests_8.sh /usr/local/bin/matpower_docker_tests.sh
ONBUILD COPY . $HOME/packages/matpower
ONBUILD RUN git clone -b ${BRANCH} --depth=1 https://github.com/MATPOWER/matpower-extras.git $HOME/packages/matpower/extras && \
rm -rf $HOME/packages/matpower/extras/.git && \
Expand All @@ -45,7 +46,7 @@ ONBUILD RUN git clone -b ${BRANCH} --depth=1 https://github.com/MATPOWER/matpowe
FROM base AS matpower_github
ONBUILD ARG MP_SRC
ONBUILD ARG BRANCH
ONBUILD COPY ./docker/matpower_docker_tests/matpower_docker_tests_7.sh /usr/local/bin/matpower_docker_tests.sh
ONBUILD COPY ./docker/matpower_docker_tests/matpower_docker_tests_8.sh /usr/local/bin/matpower_docker_tests.sh
ONBUILD RUN git clone -b ${BRANCH} --depth=1 https://github.com/MATPOWER/matpower.git $HOME/packages/matpower && \
git clone -b ${BRANCH} --depth=1 https://github.com/MATPOWER/matpower-extras.git $HOME/packages/matpower/extras && \
rm -rf $HOME/packages/matpower/.git && \
Expand Down
3 changes: 1 addition & 2 deletions docker/docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: '3'
services:
sut:
image: matpower/matpower:${CACHE_TAG}
image: matpower/matpower:${DOCKER_TAG}
command: matpower_docker_tests.sh
3 changes: 0 additions & 3 deletions docker/matpower_docker_tests/matpower_docker_tests_7mpe.sh

This file was deleted.

3 changes: 3 additions & 0 deletions docker/matpower_docker_tests/matpower_docker_tests_8.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
octave-cli --eval 'mpver'
octave-cli --eval "test_matpower && test_most && ~have_feature('mp_core', 0) && test_matpower && test_mll_main && test_syngrid"

0 comments on commit bc4b51e

Please sign in to comment.