This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemml.git
The following commit(s) were added to refs/heads/master by this push:
new b742443 [MINOR] Update Dockerfile (fixes, new R dependency)
b742443 is described below
commit b7424431f3f6131e3245c03ba8d40aa81d2cb245
Author: Sebastian <[email protected]>
AuthorDate: Sat May 23 22:40:54 2020 +0200
[MINOR] Update Dockerfile (fixes, new R dependency)
Closes #918.
---
.github/action/Dockerfile | 2 +-
.github/workflows/componentTests.yml | 17 ++++++++++++++++-
docker/build.sh | 6 +++---
docker/entrypoint.sh | 2 +-
docker/sysds.Dockerfile | 4 ++--
src/test/scripts/installDependencies.R | 1 +
6 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/.github/action/Dockerfile b/.github/action/Dockerfile
index 5a23a8e..36420da 100644
--- a/.github/action/Dockerfile
+++ b/.github/action/Dockerfile
@@ -19,4 +19,4 @@
#
#-------------------------------------------------------------
-FROM sebaba/testingsysds:0.2
+FROM sebaba/testingsysds:2.0
diff --git a/.github/workflows/componentTests.yml
b/.github/workflows/componentTests.yml
index 0cc934c..195fb5c 100644
--- a/.github/workflows/componentTests.yml
+++ b/.github/workflows/componentTests.yml
@@ -52,4 +52,19 @@ jobs:
run: mvn clean compile test-compile
- name: Component Tests
- run: mvn surefire:test -DskipTests=false
-Dtest=org.apache.sysds.test.component.*.**
+ run: |
+ log="/tmp/sysdstest.log"
+ echo "Starting Tests"
+ mvn surefire:test -DskipTests=false
-Dtest=org.apache.sysds.test.component.*.** 2>&1 > $log
+ grep_args="SUCCESS"
+ grepvals="$( tail -n 100 $log | grep $grep_args)"
+ if [[ $grepvals == *"SUCCESS"* ]]; then
+ echo "--------------------- last 100 lines from test
------------------------"
+ tail -n 100 $log
+ echo "------------------ last 100 lines from test end
-----------------------"
+ exit 0
+ else
+ echo "\n $(cat $log)"
+ exit 1
+ fi
+
diff --git a/docker/build.sh b/docker/build.sh
index 73add3c..643813e 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -23,13 +23,13 @@
# Build the docker containers
# The first build is for running systemds through docker.
-docker image build -f docker/sysds.Dockerfile -t sebaba/sysds:0.2 .
+docker image build -f docker/sysds.Dockerfile -t sebaba/sysds:2.0 .
# The second build is for testing systemds. This image installs the R
dependencies needed to run the tests.
-docker image build -f docker/testsysds.Dockerfile -t sebaba/testingsysds:0.2 .
+docker image build -f docker/testsysds.Dockerfile -t sebaba/testingsysds:2.0 .
# The third build is python docker for systemds.
-docker image build -f docker/pythonsysds.Dockerfile -t sebaba/pythonsysds:0.2 .
+docker image build -f docker/pythonsysds.Dockerfile -t sebaba/pythonsysds:2.0 .
# You might want to prune the docker system afterwards using
# docker system prune
\ No newline at end of file
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 713e948..fd80cbe 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -24,7 +24,7 @@
cd /github/workspace
-build="$(mvn -T 2 clean compile test-compile surefire:test | grep 'BUILD')"
+build="$(mvn -T 2 clean compile test-compile | grep 'BUILD')"
if [[ $build == *"SUCCESS"* ]]; then
echo "Successfull build"
diff --git a/docker/sysds.Dockerfile b/docker/sysds.Dockerfile
index 01a0094..cf788a1 100644
--- a/docker/sysds.Dockerfile
+++ b/docker/sysds.Dockerfile
@@ -39,11 +39,11 @@ RUN wget
http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/ap
# Install Extras
RUN apk add --no-cache git bash
-RUN git clone https://github.com/apache/systemml.git
+RUN git clone https://github.com/apache/systemml.git systemds
WORKDIR /usr/src/systemds/
-RUN mvn package
+RUN mvn clean package -P distribution
# Remove Maven since it is not needed for running the system
RUN rm -r /usr/lib/mvn
diff --git a/src/test/scripts/installDependencies.R
b/src/test/scripts/installDependencies.R
index 9689f63..4696361 100644
--- a/src/test/scripts/installDependencies.R
+++ b/src/test/scripts/installDependencies.R
@@ -55,6 +55,7 @@ custom_install("caret");
custom_install("sigmoid");
custom_install("DescTools");
custom_install("mice");
+custom_install("mclust");
print("Installation Done")
