This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 0ca3605 [SPARK-31533][SQL][TESTS] Enable DB2IntegrationSuite test and
upgrade the DB2 docker inside
0ca3605 is described below
commit 0ca3605d3d0c617397587c0ec24246f6ddd03768
Author: Gabor Somogyi <[email protected]>
AuthorDate: Fri Apr 24 17:56:58 2020 -0700
[SPARK-31533][SQL][TESTS] Enable DB2IntegrationSuite test and upgrade the
DB2 docker inside
### What changes were proposed in this pull request?
This is a followup PR discussed
[here](https://github.com/apache/spark/pull/28215#discussion_r410748547).
### Why are the changes needed?
It would be good to re-enable `DB2IntegrationSuite` and upgrade the docker
image inside to use the latest.
### Does this PR introduce any user-facing change?
No.
### How was this patch tested?
Existing docker integration tests.
Closes #28325 from gaborgsomogyi/SPARK-31533.
Authored-by: Gabor Somogyi <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.../org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala | 12 ++++++------
.../org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala | 4 +++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala
b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala
index b1379c7..02a7ff8 100644
---
a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala
+++
b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2IntegrationSuite.scala
@@ -21,26 +21,26 @@ import java.math.BigDecimal
import java.sql.{Connection, Date, Timestamp}
import java.util.Properties
-import org.scalatest.Ignore
-
import org.apache.spark.sql.Row
import org.apache.spark.sql.types.{BooleanType, ByteType, ShortType,
StructType}
import org.apache.spark.tags.DockerTest
@DockerTest
-@Ignore // AMPLab Jenkins needs to be updated before shared memory works on
docker
class DB2IntegrationSuite extends DockerJDBCIntegrationSuite {
override val db = new DatabaseOnDocker {
- override val imageName = "lresende/db2express-c:10.5.0.5-3.10.0"
+ override val imageName = "ibmcom/db2:11.5.0.0a"
override val env = Map(
"DB2INST1_PASSWORD" -> "rootpass",
- "LICENSE" -> "accept"
+ "LICENSE" -> "accept",
+ "DBNAME" -> "foo",
+ "ARCHIVE_LOGS" -> "false",
+ "AUTOCONFIG" -> "false"
)
override val usesIpc = false
override val jdbcPort: Int = 50000
+ override val privileged = true
override def getJdbcUrl(ip: String, port: Int): String =
s"jdbc:db2://$ip:$port/foo:user=db2inst1;password=rootpass;retrieveMessagesFromServerOnGetMessage=true;"
//scalastyle:ignore
- override def getStartupProcessName: Option[String] = Some("db2start")
}
override def dataPreparation(conn: Connection): Unit = {
diff --git
a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala
b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala
index 1c640ef..fc88985 100644
---
a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala
+++
b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/DB2KrbIntegrationSuite.scala
@@ -39,7 +39,9 @@ class DB2KrbIntegrationSuite extends
DockerKrbJDBCIntegrationSuite {
override val env = Map(
"DB2INST1_PASSWORD" -> "rootpass",
"LICENSE" -> "accept",
- "DBNAME" -> "db2"
+ "DBNAME" -> "db2",
+ "ARCHIVE_LOGS" -> "false",
+ "AUTOCONFIG" -> "false"
)
override val usesIpc = false
override val jdbcPort = 50000
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
