Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4b82a2c
Import yjshen's PR.
yjshen Aug 11, 2015
eddcc47
Use newer shaded docker-client artifact
JoshRosen Oct 19, 2015
8bb62ea
Use map for setting environment variables.
JoshRosen Oct 19, 2015
23443a5
Ensure that Docker container is cleaned up after error.
JoshRosen Oct 19, 2015
e6c7709
Remove a bunch of layers of indirection / abstraction.
JoshRosen Nov 5, 2015
d06847b
Fix networking for boot2docker.
JoshRosen Nov 5, 2015
93bcf45
Log warning in case container cleanup fails
JoshRosen Nov 5, 2015
bf98ae0
Rename class and freeze image versions
JoshRosen Nov 5, 2015
1e389e2
Automatically get docker IP from docker-machine and boot2docker.
JoshRosen Nov 5, 2015
d9c37df
Print nicer message if Docker connection fails.
JoshRosen Nov 5, 2015
95f00e1
Add test tag for excluding Docker tests in SBT.
JoshRosen Nov 5, 2015
fcf5dc4
Upgrade to non-ancient version of docker-client.
JoshRosen Nov 6, 2015
2273f87
Upgrade Jersey to avoid ASM incompatibilities / classpath ordering is…
JoshRosen Nov 6, 2015
65315c4
Merge remote-tracking branch 'origin/master' into docker-jdbc-tests
JoshRosen Nov 6, 2015
cba340f
Experiment with bumping Jersey, even though I know we can't do that.
JoshRosen Nov 6, 2015
1a09a65
Hack to fix IP address binding in Jenkins.
JoshRosen Nov 9, 2015
af84a47
Move docker tests to own subproject.
JoshRosen Nov 9, 2015
4899b2e
Add DockerTest tag.
JoshRosen Nov 9, 2015
ef85200
Use non-shaded Docker client.
JoshRosen Nov 9, 2015
6db2c1c
Fix dependency problems.
JoshRosen Nov 10, 2015
9011bc5
Merge remote-tracking branch 'origin/master' into docker-jdbc-tests
JoshRosen Nov 10, 2015
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
Prev Previous commit
Next Next commit
Add DockerTest tag.
  • Loading branch information
JoshRosen committed Nov 9, 2015
commit 4899b2e91f474bad79fe1b5d44654f9b76f2b6b0
6 changes: 6 additions & 0 deletions docker-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-test-tags_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.spotify</groupId>
<artifactId>docker-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ import java.math.BigDecimal
import java.sql.{Connection, Date, Timestamp}
import java.util.Properties

import org.apache.spark.tags.DockerTest

@DockerTest
class MySQLIntegrationSuite extends DockerJDBCIntegrationSuite {
override val db = new DatabaseOnDocker {
override val imageName = "mysql:5.7.9"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ package org.apache.spark.sql.jdbc
import java.sql.Connection
import java.util.Properties

import org.apache.spark.tags.DockerTest

@DockerTest
class PostgresIntegrationSuite extends DockerJDBCIntegrationSuite {
override val db = new DatabaseOnDocker {
override val imageName = "postgres:9.4.5"
Expand Down
26 changes: 26 additions & 0 deletions tags/src/main/java/org/apache/spark/tags/DockerTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* 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.
*/

package org.apache.spark.tags;

import java.lang.annotation.*;
import org.scalatest.TagAnnotation;

@TagAnnotation
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.TYPE})
public @interface DockerTest { }