From 308d07dec47308bb54dea96f01c477c48e31e2d6 Mon Sep 17 00:00:00 2001
From: Ray Zimmerman <rz10@cornell.edu>
Date: Tue, 4 Jun 2024 16:59:48 -0600
Subject: [PATCH] Fix and update Docker auto testing.

---
 docker/Dockerfile                                          | 5 +++--
 docker/docker-compose.test.yml                             | 3 +--
 docker/matpower_docker_tests/matpower_docker_tests_7mpe.sh | 3 ---
 docker/matpower_docker_tests/matpower_docker_tests_8.sh    | 3 +++
 4 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100755 docker/matpower_docker_tests/matpower_docker_tests_7mpe.sh
 create mode 100755 docker/matpower_docker_tests/matpower_docker_tests_8.sh

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1f82db8d..d23b8a3f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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 .
@@ -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 && \
@@ -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 && \
diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml
index c3e1e30f..13596eea 100644
--- a/docker/docker-compose.test.yml
+++ b/docker/docker-compose.test.yml
@@ -1,5 +1,4 @@
-version: '3'
 services:
   sut:
-    image: matpower/matpower:${CACHE_TAG}
+    image: matpower/matpower:${DOCKER_TAG}
     command: matpower_docker_tests.sh
diff --git a/docker/matpower_docker_tests/matpower_docker_tests_7mpe.sh b/docker/matpower_docker_tests/matpower_docker_tests_7mpe.sh
deleted file mode 100755
index f93c41d9..00000000
--- a/docker/matpower_docker_tests/matpower_docker_tests_7mpe.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-octave-cli --eval 'mpver'
-octave-cli --eval "f = @mp_table; test_matpower && test_most && ~have_feature('mp_core', 0) && test_mll_main && test_syngrid && have_feature('mp_core', 1) && test_mp_core"
diff --git a/docker/matpower_docker_tests/matpower_docker_tests_8.sh b/docker/matpower_docker_tests/matpower_docker_tests_8.sh
new file mode 100755
index 00000000..fcd53b35
--- /dev/null
+++ b/docker/matpower_docker_tests/matpower_docker_tests_8.sh
@@ -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"