From 1af493cb3a95cbafa373955be0a57d06fb6ebf0d Mon Sep 17 00:00:00 2001 From: diverdane Date: Wed, 18 Dec 2019 07:34:18 -0500 Subject: [PATCH] Adds baseline IT tests for different versions of MSSQL servers This test extends the MSSQL integration tests by adding test for running the existing test suite against the following MSSQL server versions: - 2019-latest - 2017-CU1-ubuntu in addition to the `2017-latest` version that is used in the existing test. Addresses serverless-broker Issue #1017. --- test/connector/tcp/mssql/server-2017-CU1/dev | 3 ++ .../docker-compose.override.yml | 5 +++ .../connector/tcp/mssql/server-2017-CU1/start | 13 ++++++++ test/connector/tcp/mssql/server-2017-CU1/stop | 4 +++ test/connector/tcp/mssql/server-2017-CU1/test | 4 +++ test/connector/tcp/mssql/server-2019/dev | 3 ++ .../server-2019/docker-compose.override.yml | 5 +++ test/connector/tcp/mssql/server-2019/start | 13 ++++++++ test/connector/tcp/mssql/server-2019/stop | 4 +++ test/connector/tcp/mssql/server-2019/test | 4 +++ test/connector/tcp/mssql/start | 32 +++++++++++++++---- 11 files changed, 84 insertions(+), 6 deletions(-) create mode 100755 test/connector/tcp/mssql/server-2017-CU1/dev create mode 100644 test/connector/tcp/mssql/server-2017-CU1/docker-compose.override.yml create mode 100755 test/connector/tcp/mssql/server-2017-CU1/start create mode 100755 test/connector/tcp/mssql/server-2017-CU1/stop create mode 100755 test/connector/tcp/mssql/server-2017-CU1/test create mode 100755 test/connector/tcp/mssql/server-2019/dev create mode 100644 test/connector/tcp/mssql/server-2019/docker-compose.override.yml create mode 100755 test/connector/tcp/mssql/server-2019/start create mode 100755 test/connector/tcp/mssql/server-2019/stop create mode 100755 test/connector/tcp/mssql/server-2019/test diff --git a/test/connector/tcp/mssql/server-2017-CU1/dev b/test/connector/tcp/mssql/server-2017-CU1/dev new file mode 100755 index 000000000..fc49fa638 --- /dev/null +++ b/test/connector/tcp/mssql/server-2017-CU1/dev @@ -0,0 +1,3 @@ +#!/bin/bash -ex + +./start -d diff --git a/test/connector/tcp/mssql/server-2017-CU1/docker-compose.override.yml b/test/connector/tcp/mssql/server-2017-CU1/docker-compose.override.yml new file mode 100644 index 000000000..0a135d0c6 --- /dev/null +++ b/test/connector/tcp/mssql/server-2017-CU1/docker-compose.override.yml @@ -0,0 +1,5 @@ +version: '3.0' + +services: + mssql: + image: mcr.microsoft.com/mssql/server:2017-CU1-ubuntu diff --git a/test/connector/tcp/mssql/server-2017-CU1/start b/test/connector/tcp/mssql/server-2017-CU1/start new file mode 100755 index 000000000..e8915259e --- /dev/null +++ b/test/connector/tcp/mssql/server-2017-CU1/start @@ -0,0 +1,13 @@ +#!/bin/bash -ex + +dev_mode_flag= +while getopts ":d" opt; do + case $opt in + d) dev_mode_flag="-d";; + *) echo "Unknown option -$OPTARG"; exit 1;; + esac +done + +save_dir=$(pwd) +cd .. +./start -f $save_dir/docker-compose.override.yml $dev_mode_flag diff --git a/test/connector/tcp/mssql/server-2017-CU1/stop b/test/connector/tcp/mssql/server-2017-CU1/stop new file mode 100755 index 000000000..7d997e319 --- /dev/null +++ b/test/connector/tcp/mssql/server-2017-CU1/stop @@ -0,0 +1,4 @@ +#!/bin/bash -ex + +cd .. +./stop diff --git a/test/connector/tcp/mssql/server-2017-CU1/test b/test/connector/tcp/mssql/server-2017-CU1/test new file mode 100755 index 000000000..7cdb9a06e --- /dev/null +++ b/test/connector/tcp/mssql/server-2017-CU1/test @@ -0,0 +1,4 @@ +#!/bin/bash -ex + +cd .. +./test diff --git a/test/connector/tcp/mssql/server-2019/dev b/test/connector/tcp/mssql/server-2019/dev new file mode 100755 index 000000000..fc49fa638 --- /dev/null +++ b/test/connector/tcp/mssql/server-2019/dev @@ -0,0 +1,3 @@ +#!/bin/bash -ex + +./start -d diff --git a/test/connector/tcp/mssql/server-2019/docker-compose.override.yml b/test/connector/tcp/mssql/server-2019/docker-compose.override.yml new file mode 100644 index 000000000..a00e23ec8 --- /dev/null +++ b/test/connector/tcp/mssql/server-2019/docker-compose.override.yml @@ -0,0 +1,5 @@ +version: '3.0' + +services: + mssql: + image: mcr.microsoft.com/mssql/server:2019-latest diff --git a/test/connector/tcp/mssql/server-2019/start b/test/connector/tcp/mssql/server-2019/start new file mode 100755 index 000000000..e8915259e --- /dev/null +++ b/test/connector/tcp/mssql/server-2019/start @@ -0,0 +1,13 @@ +#!/bin/bash -ex + +dev_mode_flag= +while getopts ":d" opt; do + case $opt in + d) dev_mode_flag="-d";; + *) echo "Unknown option -$OPTARG"; exit 1;; + esac +done + +save_dir=$(pwd) +cd .. +./start -f $save_dir/docker-compose.override.yml $dev_mode_flag diff --git a/test/connector/tcp/mssql/server-2019/stop b/test/connector/tcp/mssql/server-2019/stop new file mode 100755 index 000000000..7d997e319 --- /dev/null +++ b/test/connector/tcp/mssql/server-2019/stop @@ -0,0 +1,4 @@ +#!/bin/bash -ex + +cd .. +./stop diff --git a/test/connector/tcp/mssql/server-2019/test b/test/connector/tcp/mssql/server-2019/test new file mode 100755 index 000000000..7cdb9a06e --- /dev/null +++ b/test/connector/tcp/mssql/server-2019/test @@ -0,0 +1,4 @@ +#!/bin/bash -ex + +cd .. +./test diff --git a/test/connector/tcp/mssql/start b/test/connector/tcp/mssql/start index 57472ef46..1c620c9f8 100755 --- a/test/connector/tcp/mssql/start +++ b/test/connector/tcp/mssql/start @@ -1,19 +1,39 @@ #!/bin/bash -ex -SECRETLESS_HOST=secretless -while getopts :d opt; do +secretless_host="secretless" +while getopts ":df:h" opt; do case $opt in - d) SECRETLESS_HOST=secretless-dev;; - \?) echo "Unknown option -$OPTARG"; exit 1;; + d) secretless_host="secretless-dev";; + f) docker_override_file=${OPTARG};; + h) help_and_exit 0;; + *) echo "Unknown option -$OPTARG"; exit 1;; esac done +if [ -n "$docker_override_file" ]; then + override_args="-f $docker_override_file" +fi + +help_and_exit() { + local retval=${1:-1} + cat < + Docker compose override file. + -h Show this command usage +EOF + exit "$retval" +} ./stop # the order of the services is important. mssql must be up before we start secretless -docker-compose up -d mssql +docker-compose -f docker-compose.yml $override_args up -d mssql time ./wait_for_mssql docker-compose logs mssql -docker-compose up -d $SECRETLESS_HOST +docker-compose up -d $secretless_host