Allow enabling/disabling HANA tests via env. variable

qgis · Dec 7, 2020 · f9f316c · f9f316c
1 parent 48961ef
commit f9f316c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/.ci/travis/linux/docker-variables.env b/.ci/travis/linux/docker-variables.env
@@ -23,7 +23,8 @@ CTEST_BUILD_DIR=/root/QGIS
 # Other var
 QGIS_NO_OVERRIDE_IMPORT=1
 
-# HANA connection values
+# HANA provider settings
+HANA_TESTS
 HANA_HOST
 HANA_PORT
 HANA_USER

diff --git a/.ci/travis/linux/scripts/docker-qgis-build.sh b/.ci/travis/linux/scripts/docker-qgis-build.sh
@@ -33,6 +33,11 @@ echo "${bold}Running cmake...${endbold}"
 export CC=/usr/lib/ccache/clang
 export CXX=/usr/lib/ccache/clang++
 
+HANA_TESTS_ENABLED=OFF
+if [ ${HANA_TESTS} == "true" ] && [ ${TRAVIS_PULL_REQUEST} == "false" ]; then
+  HANA_TESTS_ENABLED=ON
+fi
+
 cmake \
  -GNinja \
  -DUSE_CCACHE=OFF \
@@ -45,7 +50,7 @@ cmake \
  -DENABLE_PGTEST=ON \
  -DENABLE_SAGA_TESTS=ON \
  -DENABLE_MSSQLTEST=ON \
- -DENABLE_HANATEST=ON \
+ -DENABLE_HANATEST=$HANA_TESTS_ENABLED \
  -DWITH_HANA=ON \
  -DWITH_QSPATIALITE=ON \
  -DWITH_QWTPOLAR=OFF \

diff --git a/.ci/travis/linux/scripts/docker-qgis-test.sh b/.ci/travis/linux/scripts/docker-qgis-test.sh
@@ -10,21 +10,24 @@ set -e
 ##################################
 # Prepare HANA database connection
 ##################################
-echo "travis_fold:start:hana"
-echo "${bold}Load HANA database...${endbold}"   
 
-export QGIS_HANA_TEST_DB='driver='/usr/sap/hdbclient/libodbcHDB.so' host='${HANA_HOST}' port='${HANA_PORT}' user='${HANA_USER}' password='${HANA_PASSWORD}' sslEnabled=true sslValidateCertificate=False'
-
-# wait for the DB to be available
-echo "Wait a moment while trying to connect to a HANA database."
-while ! echo exit | hdbsql -n '${HANA_HOST}:${HANA_PORT}' -u '${HANA_USER}' -p '${HANA_PASSWORD}' &> /dev/null
-do
-  printf "."
-  sleep 1
-done
-echo " done"
-
-echo "travis_fold:end:hana"
+if [ ${HANA_TESTS} == "true" ] && [ ${TRAVIS_PULL_REQUEST} == "false" ]; then
+  echo "travis_fold:start:hana"
+  echo "${bold}Load HANA database...${endbold}"   
+
+  export QGIS_HANA_TEST_DB='driver='/usr/sap/hdbclient/libodbcHDB.so' host='${HANA_HOST}' port='${HANA_PORT}' user='${HANA_USER}' password='${HANA_PASSWORD}' sslEnabled=true sslValidateCertificate=False'
+
+  # wait for the DB to be available
+  echo "Wait a moment while trying to connect to a HANA database."
+  while ! echo exit | hdbsql -n '${HANA_HOST}:${HANA_PORT}' -u '${HANA_USER}' -p '${HANA_PASSWORD}' &> /dev/null
+  do
+    printf "."
+    sleep 1
+  done
+  echo " done"
+
+  echo "travis_fold:end:hana"
+fi
 
 ############################
 # Restore postgres test data