From f765858557cb5b58cb9ab3c01cb95c84b006b5f2 Mon Sep 17 00:00:00 2001 From: Ondrej Musil Date: Thu, 7 Nov 2019 11:07:15 +0900 Subject: [PATCH 1/3] Use qore-test-base:4.0 image for tests --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 599a743..dfa90d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: test: stage: test - image: $CI_REGISTRY/infrastructure/qore-test-base/qore-test-base:develop-slim + image: $CI_REGISTRY/infrastructure/qore-test-base/qore-test-base:4.0 tags: - docker-exec variables: From ef253ff5cbecc6e9e4cbc2375320a7018c272306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Musil?= Date: Thu, 7 Nov 2019 21:11:37 +0900 Subject: [PATCH 2/3] Add freetds.conf file --- .gitlab-ci.yml | 3 +-- test/docker_test/test.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfa90d0..afb8ddb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,7 @@ test: tags: - docker-exec variables: - TDSVER: "7.2" - QORE_DB_CONNSTR_FREETDS: 'freetds:test/test@mssql%192.168.20.93:1433' + QORE_DB_CONNSTR_FREETDS: 'freetds:test/test@mssql' REPO_NAME: module-sybase script: - | diff --git a/test/docker_test/test.sh b/test/docker_test/test.sh index a765eab..2962fdf 100755 --- a/test/docker_test/test.sh +++ b/test/docker_test/test.sh @@ -33,6 +33,17 @@ cd ${MODULE_SRC_DIR} make -j${MAKE_JOBS} make install +# add freetds.conf file +echo " +[global] + text size = 64512 + +[mssql] + host = 192.168.20.93 + port = 1433 + tds version = 7.2 +" > /etc/freetds.conf + # add Qore user and group groupadd -o -g ${QORE_GID} qore useradd -o -m -d /home/qore -u ${QORE_UID} -g ${QORE_GID} qore From 05c243fc80069f56f9f0bb0171adde2b6279fb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Musil?= Date: Thu, 7 Nov 2019 23:18:57 +0900 Subject: [PATCH 3/3] Put back TDSVER env var + fixed conn string --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afb8ddb..dfa90d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,8 @@ test: tags: - docker-exec variables: - QORE_DB_CONNSTR_FREETDS: 'freetds:test/test@mssql' + TDSVER: "7.2" + QORE_DB_CONNSTR_FREETDS: 'freetds:test/test@mssql%192.168.20.93:1433' REPO_NAME: module-sybase script: - |