You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lb...@apache.org on 2016/05/16 21:56:05 UTC
[2/2] incubator-toree git commit: Rename to system tests,
run unit before system tests,
and run operations in container instead of building it
Rename to system tests, run unit before system tests,
and run operations in container instead of building it
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/4b2b2c7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/4b2b2c7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/4b2b2c7a
Branch: refs/heads/master
Commit: 4b2b2c7a55239ed707b699ec836dae58ef2a00e8
Parents: 9df6ce9
Author: Michael Poplavski <mi...@gmail.com>
Authored: Tue May 10 16:24:15 2016 -0500
Committer: Michael Poplavski <mi...@gmail.com>
Committed: Wed May 11 09:18:55 2016 -0500
----------------------------------------------------------------------
Dockerfile.jupyter_kernel_tests | 32 --------------------------------
Makefile | 18 ++++++++++--------
2 files changed, 10 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/4b2b2c7a/Dockerfile.jupyter_kernel_tests
----------------------------------------------------------------------
diff --git a/Dockerfile.jupyter_kernel_tests b/Dockerfile.jupyter_kernel_tests
deleted file mode 100644
index 89cf136..0000000
--- a/Dockerfile.jupyter_kernel_tests
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-#
-
-FROM jupyter/pyspark-notebook
-
-# Apache Toree kernel install
-ADD dist/toree-pip /srv/toree-pip
-RUN pip install /srv/toree-pip/toree*.tar.gz
-RUN jupyter toree install --user --kernel_name='Apache_Toree'
-
-#jupyter kernel tests install
-RUN pip install nose
-RUN pip install jupyter_kernel_test
-
-ADD test_toree.py /srv/test_toree.py
-
-# run jupyter kernel test script
-CMD ["python", "/srv/test_toree.py"]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/4b2b2c7a/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index e4fa842..3024948 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
# limitations under the License
#
-.PHONY: help clean clean-dist build dev test test-travis release pip-release bin-release dev-binder .binder-image audit audit-licenses
+.PHONY: help clean clean-dist build dev test system-test test-travis release pip-release bin-release dev-binder .binder-image audit audit-licenses
BASE_VERSION=0.1.0.dev8
VERSION=$(BASE_VERSION)-incubating
@@ -117,7 +117,7 @@ dev: .example-image dist
&& jupyter notebook --ip=* --no-browser"
test: VM_WORKDIR=/src/toree-kernel
-test: jupyter-tests
+test:
$(call RUN,$(ENV_OPTS) sbt compile test)
sbt-%:
@@ -176,13 +176,15 @@ jupyter: .example-image pip-release
################################################################################
# System Tests Using Jupyter Kernel Test (https://github.com/jupyter/jupyter_kernel_test)
################################################################################
-jupyter-tests: pip-release
- @echo '-- Building jupyter kernel test image'
- @docker build -f Dockerfile.jupyter_kernel_tests -t toree/jupyter-kernel-test .
+system-test: pip-release
@echo '-- Running jupyter kernel tests'
@docker run --rm -ti \
--name jupyter_kernel_tests \
- toree/jupyter-kernel-test
+ -v `pwd`/dist/toree-pip:/srv/toree-pip \
+ -v `pwd`/test_toree.py:/srv/test_toree.py \
+ $(IMAGE) \
+ bash -c "pip install /srv/toree-pip/toree*.tar.gz ; jupyter toree install --user --kernel_name='Apache_Toree' ; \
+ pip install nose jupyter_kernel_test ; python /srv/test_toree.py"
################################################################################
# Jars
@@ -273,9 +275,9 @@ audit: sign audit-licenses
publish: audit publish-bin publish-pip publish-src publish-jars
-all: clean test audit
+all: clean test system-test audit
-all-travis: clean test audit-licenses
+all-travis: clean test system-test audit-licenses
clean-travis:
find $(HOME)/.sbt -name "*.lock" | xargs rm