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 b1379c70ad..02a7ff8f16 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 1c640efa20..fc88985cf2 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