From a42b06a1683eb65b3b802fd861ddd94c6a475755 Mon Sep 17 00:00:00 2001 From: zy-kkk Date: Thu, 6 Jun 2024 17:21:40 +0800 Subject: [PATCH] [branch-2.1][test](jdbc catalog) Change the db2 image address and repair test (#35967) --- docker/thirdparties/docker-compose/db2/db2.yaml.tpl | 4 ++-- .../external_table_p0/jdbc/test_db2_jdbc_catalog.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/thirdparties/docker-compose/db2/db2.yaml.tpl b/docker/thirdparties/docker-compose/db2/db2.yaml.tpl index 79c5789ccf..9967e4013b 100644 --- a/docker/thirdparties/docker-compose/db2/db2.yaml.tpl +++ b/docker/thirdparties/docker-compose/db2/db2.yaml.tpl @@ -19,12 +19,12 @@ version: '3' services: doris--db2_11: - image: ibmcom/db2:11.5.0.0a + image: icr.io/db2_community/db2:11.5.9.0 ports: - ${DOCKER_DB2_EXTERNAL_PORT}:50000 privileged: true healthcheck: - test: ["CMD-SHELL", "su - db2inst1 -c \"db2 connect to doris && db2 'select 1 from sysibm.sysdummy1'\""] + test: ["CMD-SHELL", "su - db2inst1 -c \"source ~/.bash_profile; db2 connect to doris && db2 'select 1 from sysibm.sysdummy1'\""] interval: 20s timeout: 60s retries: 10 diff --git a/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy b/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy index a7e7ecf764..ee930bbf6c 100644 --- a/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy +++ b/regression-test/suites/external_table_p0/jdbc/test_db2_jdbc_catalog.groovy @@ -202,7 +202,7 @@ suite("test_db2_jdbc_catalog", "p0,external,db2,external_docker,external_docker_ "type"="jdbc", "user"="db2inst1", "password"="123456", - "jdbc_url" = "jdbc:db2://${externalEnvIp}:${db2_port}/doris", + "jdbc_url" = "jdbc:db2://${externalEnvIp}:${db2_port}/doris:allowNextOnExhaustedResultSet=1;resultSetHoldability=1", "driver_url" = "${driver_url}", "driver_class" = "com.ibm.db2.jcc.DB2Driver" );"""