This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 970c9b3e ci: enable Java integration tests (#1042)
970c9b3e is described below
commit 970c9b3e3549e446c4e20d108a8efc454522fb90
Author: David Li <[email protected]>
AuthorDate: Mon Sep 11 12:54:24 2023 -0400
ci: enable Java integration tests (#1042)
Fixes #728.
---
.github/workflows/java.yml | 20 +++++---------------
docker-compose.yml | 9 +++++++++
java/driver/jdbc-validation-mssqlserver/pom.xml | 17 ++++++++++++++++-
3 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index d955ab2d..ba6bb563 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -43,19 +43,6 @@ jobs:
strategy:
matrix:
java: ['8', '11', '17', '20']
- services:
- postgres:
- image: postgres
- env:
- POSTGRES_DB: postgres
- POSTGRES_PASSWORD: password
- options: >-
- --health-cmd pg_isready
- --health-interval 10s
- --health-timeout 5s
- --health-retries 5
- ports:
- - 5432:5432
steps:
- uses: actions/checkout@v3
with:
@@ -66,13 +53,16 @@ jobs:
cache: "maven"
distribution: "temurin"
java-version: ${{ matrix.java }}
- - name: Start SQLite server
+ - name: Start test services
shell: bash -l {0}
run: |
- docker-compose up -d flightsql-sqlite-test
+ docker compose up -d --wait flightsql-sqlite-test mssql-test
postgres-test
- name: Build/Test
env:
ADBC_SQLITE_FLIGHTSQL_URI: "grpc+tcp://localhost:8080"
+ ADBC_JDBC_MSSQL_URL: "localhost:1433"
+ ADBC_JDBC_MSSQL_USER: "SA"
+ ADBC_JDBC_MSSQL_PASSWORD: "Password1!"
ADBC_JDBC_POSTGRESQL_URL: "localhost:5432/postgres"
ADBC_JDBC_POSTGRESQL_USER: "postgres"
ADBC_JDBC_POSTGRESQL_PASSWORD: "password"
diff --git a/docker-compose.yml b/docker-compose.yml
index 2c77d721..34aed8bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -170,6 +170,15 @@ services:
ports:
- 8080:8080
+ mssql-test:
+ container_name: adbc_mssql_test
+ image: mcr.microsoft.com/mssql/server:2022-latest
+ environment:
+ ACCEPT_EULA: "Y"
+ MSSQL_SA_PASSWORD: "Password1!"
+ ports:
+ - "1433:1433"
+
postgres-test:
container_name: adbc_postgres_test
image: postgres:latest
diff --git a/java/driver/jdbc-validation-mssqlserver/pom.xml
b/java/driver/jdbc-validation-mssqlserver/pom.xml
index e0ba64cc..f7e3a97a 100644
--- a/java/driver/jdbc-validation-mssqlserver/pom.xml
+++ b/java/driver/jdbc-validation-mssqlserver/pom.xml
@@ -25,6 +25,7 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
+ <dep.mssql-jdbc.version>12.4.1.jre11</dep.mssql-jdbc.version>
</properties>
<dependencies>
@@ -42,7 +43,8 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
- <version>12.2.0.jre11</version>
+ <version>${dep.mssql-jdbc.version}</version>
+ <scope>test</scope>
</dependency>
<!-- Testing -->
@@ -62,4 +64,17 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jdk8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+
+ <properties>
+ <dep.mssql-jdbc.version>12.4.1.jre8</dep.mssql-jdbc.version>
+ </properties>
+ </profile>
+ </profiles>
</project>
