Skip to content

Re-enable MSSQL in CI (4.x) #1459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vietj merged 2 commits into from
Aug 22, 2024
Merged

Re-enable MSSQL in CI (4.x) #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbc049e
Revert "For now remove MSSQL from CI as it cannot pass due to a conta…
tsegismont Aug 22, 2024
7e78b12
Fix mssql containers setup
tsegismont Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci-4.x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
# profile: [PostgreSQL-9,PostgreSQL-10,PostgreSQL-11,MySQL-8.0,MySQL-5.6,MySQL-5.7,MariaDB-10.4,MSSQL-2017-latest,MSSQL-2019-latest,DB2-11.5,Oracle-23,SQL-templates]
# Removed MSSQL that fails in CI docker
profile: [PostgreSQL-9,PostgreSQL-10,PostgreSQL-11,MySQL-8.0,MySQL-5.6,MySQL-5.7,MariaDB-10.4,DB2-11.5,Oracle-23,SQL-templates]
profile: [PostgreSQL-9,PostgreSQL-10,PostgreSQL-11,MySQL-8.0,MySQL-5.6,MySQL-5.7,MariaDB-10.4,MSSQL-2017-latest,MSSQL-2019-latest,DB2-11.5,Oracle-23,SQL-templates]
jdk: [8, 17]
exclude:
- profile: Oracle-23
Expand Down
6 changes: 3 additions & 3 deletions vertx-mssql-client/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ services:
TZ: UTC
SA_PASSWORD: A_Str0ng_Required_Password
test-mssql-initdb:
image: mcr.microsoft.com/mssql-tools
image: mcr.microsoft.com/mssql/server:${MSSQL_VERSION:-2019-latest}
depends_on:
- "test-mssql"
command: [ "sh", "/opt/mssql-tools/bin/initdb.sh","test-mssql,1433","A_Str0ng_Required_Password","/opt/data/init.sql" ]
command: [ "sh", "/opt/mssql-tools18/bin/initdb.sh","test-mssql,1433","A_Str0ng_Required_Password","/opt/data/init.sql" ]
volumes:
- type: bind
source: ./initdb.sh
target: /opt/mssql-tools/bin/initdb.sh
target: /opt/mssql-tools18/bin/initdb.sh
read_only: true
- type: bind
source: ../src/test/resources/init.sql
Expand Down
4 changes: 2 additions & 2 deletions vertx-mssql-client/docker/initdb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ SERVER="$1"
PASSWORD="$2"
SQL_FILE="$3"

until /opt/mssql-tools/bin/sqlcmd -l 1 -S $SERVER -U SA -P $PASSWORD -q "SELECT 1"; do
until /opt/mssql-tools18/bin/sqlcmd -l 1 -S $SERVER -U SA -P $PASSWORD -C -No -q "SELECT 1"; do
>&2 echo "MSSQL is unavailable - sleeping"
sleep 1
done

>&2 echo "MSSQL is up - executing command"
/opt/mssql-tools/bin/sqlcmd -S $SERVER -U SA -P $PASSWORD -i $SQL_FILE
/opt/mssql-tools18/bin/sqlcmd -S $SERVER -U SA -P $PASSWORD -i $SQL_FILE -C -No
5 changes: 3 additions & 2 deletions vertx-mssql-client/src/test/java/io/vertx/mssqlclient/junit/MSSQLRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,12 @@ private MSSQLConnectOptions startMSSQL() throws IOException {
private void initDb() throws IOException {
try {
ExecResult execResult = server.execInContainer(
"/opt/mssql-tools/bin/sqlcmd",
"/opt/mssql-tools18/bin/sqlcmd",
"-S", "localhost",
"-U", USER,
"-P", PASSWORD,
"-i", INIT_SQL
"-i", INIT_SQL,
"-C", "-No"
);
if (execResult.getExitCode() != 0) {
throw new RuntimeException(String.format("Failure while initializing database%nstdout:%s%nstderr:%s%n", execResult.getStdout(), execResult.getStderr()));
Expand Down