Skip to content
Merged
11 changes: 9 additions & 2 deletions .github/workflows/cpp_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,9 @@ jobs:
include:
- image: ubuntu-cpp-odbc
title: AMD64 Ubuntu
- image: debian-cpp-odbc
title: AMD64 Debian
# GH-49582: TODO Enable Debian build for ODBC
# - image: debian-cpp-odbc
# title: AMD64 Debian
Comment on lines +380 to +382

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disable Debian build since we don't have capacity to work on it right now.

env:
ARCH: amd64
ARCHERY_DEBUG: 1
Expand All @@ -391,6 +392,12 @@ jobs:
with:
fetch-depth: 0
submodules: recursive
- name: Create Docker Test Network
run: docker network create odbc_net
- name: Set Up Dremio Instance
run: |
docker compose -f cpp/src/arrow/flight/sql/odbc/tests/dremio/docker-compose.yml up -d
cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance.sh
- name: Cache Docker Volumes
uses: actions/cache@v5
with:
Expand Down
8 changes: 8 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ volumes:
ubuntu-ccache:
name: ${ARCH}-ubuntu-${UBUNTU}-ccache

networks:
# GH-48068 for Flight SQL ODBC Testing
odbc_net:
external: true

services:

################################# C++ #######################################
Expand Down Expand Up @@ -558,6 +563,7 @@ services:
ARROW_DEPENDENCY_SOURCE: BUNDLED
ARROW_DEPENDENCY_USE_SHARED: "OFF"
ARROW_FLIGHT_SQL_ODBC: "ON"
ARROW_FLIGHT_SQL_ODBC_CONN: "driver={Apache Arrow Flight SQL ODBC Driver};HOST=dremio_container;port=32010;pwd=admin2025;uid=admin;useEncryption=false;UseWideChar=true;"
ARROW_GANDIVA: "OFF"
ARROW_GCS: "OFF"
ARROW_HDFS: "OFF"
Expand All @@ -568,6 +574,8 @@ services:
# GH-49651 Link ODBC tests statically on Linux to fix segfault
ARROW_TEST_LINKAGE: "static"
# Register ODBC before running tests
networks:
- odbc_net
command: >
/bin/bash -c "
/arrow/ci/scripts/cpp_build.sh /arrow /build &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
# specific language governing permissions and limitations
# under the License.

# GH-48068 TODO: run remote ODBC tests on Linux
networks:
odbc_net:
external: true

services:
dremio:
Expand All @@ -33,3 +35,5 @@ services:
interval: 10s
timeout: 5s
retries: 30
networks:
- odbc_net

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file mode change is required.

Empty file.
Loading