From 82d9e223b08e7bf2d7e2fea66e9db32187cdb095 Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Mon, 2 Dec 2019 17:22:05 +0100
Subject: [PATCH] [TASK] Use mssql-2017-cu17
docker-compose is updated to use the latest cumulative update (cu) of
MSSQL 2017.
Since mssql is probably still eager to fail, its stages are executed at
last in the nightly builds now.
Resolves: #89826
Releases: master, 9.5, 8.7
Change-Id: Ic1e8195f9b4f90747b5843d03630fd453ebe0bc6
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/62511
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
Build/Scripts/runTests.sh | 4 ++--
.../src/main/java/core/AbstractCoreSpec.java | 4 ++--
Build/bamboo/src/main/java/core/NightlySpec.java | 6 +++---
Build/testing-docker/bamboo/docker-compose.yml | 8 ++++----
Build/testing-docker/local/docker-compose.yml | 14 +++++++-------
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
index 7c3763d1e41c..2ac8251f148e 100755
--- a/Build/Scripts/runTests.sh
+++ b/Build/Scripts/runTests.sh
@@ -405,8 +405,8 @@ case ${TEST_SUITE} in
;;
mssql)
[[ ! -z "$DATABASE_DRIVER" ]] && echo "Using driver: ${DATABASE_DRIVER}"
- docker-compose run prepare_functional_mssql2017cu9
- docker-compose run functional_mssql2017cu9
+ docker-compose run prepare_functional_mssql2017cu17
+ docker-compose run functional_mssql2017cu17
SUITE_EXIT_CODE=$?
;;
mssql2017latest)
diff --git a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
index ac33f6fd7e52..7086fac2a37e 100644
--- a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
+++ b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
@@ -674,7 +674,7 @@ abstract class AbstractCoreSpec {
" -e typo3DatabaseHost=localhost \\\n" +
" -e typo3DatabasePort=1433 \\\n" +
" -e typo3DatabaseCharset=utf-8 \\\n" +
- " -e typo3DatabaseHost=mssql2017cu9 \\\n" +
+ " -e typo3DatabaseHost=mssql2017cu17 \\\n" +
" -e typo3TestingRedisHost=${BAMBOO_COMPOSE_PROJECT_NAME}sib_redis4_1 \\\n" +
" -e typo3TestingMemcachedHost=${BAMBOO_COMPOSE_PROJECT_NAME}sib_memcached1-5_1 \\\n" +
" --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
@@ -741,7 +741,7 @@ abstract class AbstractCoreSpec {
" -e typo3DatabaseHost=localhost \\\n" +
" -e typo3DatabasePort=1433 \\\n" +
" -e typo3DatabaseCharset=utf-8 \\\n" +
- " -e typo3DatabaseHost=mssql2017cu9 \\\n" +
+ " -e typo3DatabaseHost=mssql2017cu17 \\\n" +
" -e typo3TestingRedisHost=${BAMBOO_COMPOSE_PROJECT_NAME}sib_redis4_1 \\\n" +
" -e typo3TestingMemcachedHost=${BAMBOO_COMPOSE_PROJECT_NAME}sib_memcached1-5_1 \\\n" +
" --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
diff --git a/Build/bamboo/src/main/java/core/NightlySpec.java b/Build/bamboo/src/main/java/core/NightlySpec.java
index 5faa26ff3623..603c59e82550 100644
--- a/Build/bamboo/src/main/java/core/NightlySpec.java
+++ b/Build/bamboo/src/main/java/core/NightlySpec.java
@@ -111,10 +111,10 @@ public class NightlySpec extends AbstractCoreSpec {
stageCodeceptionPgSqlStage,
stageFunctionalMySqlStage,
stageFunctionalMySqlPdoStage,
- stageFunctionalMsSqlStage,
- stageFunctionalMsSqlPdoStage,
stageFunctionalPgSqlStage,
- stageFunctionalSqLiteStage
+ stageFunctionalSqLiteStage,
+ stageFunctionalMsSqlStage,
+ stageFunctionalMsSqlPdoStage
)
.linkedRepositories("github TYPO3 TYPO3.CMS")
.triggers(
diff --git a/Build/testing-docker/bamboo/docker-compose.yml b/Build/testing-docker/bamboo/docker-compose.yml
index c1d568972f16..f993b3c76d1c 100644
--- a/Build/testing-docker/bamboo/docker-compose.yml
+++ b/Build/testing-docker/bamboo/docker-compose.yml
@@ -23,8 +23,8 @@ services:
- /var/lib/postgresql/data:rw,noexec,nosuid
networks:
- test
- mssql2017cu9:
- image: mcr.microsoft.com/mssql/server:2017-CU9-ubuntu
+ mssql2017cu17:
+ image: mcr.microsoft.com/mssql/server:2017-CU17-ubuntu
environment:
ACCEPT_EULA: Y
SA_PASSWORD: Test1234!
@@ -156,7 +156,7 @@ services:
start_dependencies_functional_mssql:
image: alpine:3.8
links:
- - mssql2017cu9
+ - mssql2017cu17
- redis4
- memcached1-5
networks:
@@ -165,7 +165,7 @@ services:
/bin/sh -c "
echo Waiting for database start
COUNT=0
- while ! nc -z mssql2017cu9 1433; do
+ while ! nc -z mssql2017cu17 1433; do
if [ "$${COUNT}" -ge "60" ]; then
echo Database did not come up
exit 1
diff --git a/Build/testing-docker/local/docker-compose.yml b/Build/testing-docker/local/docker-compose.yml
index 5b388a228dc5..da18531098b9 100644
--- a/Build/testing-docker/local/docker-compose.yml
+++ b/Build/testing-docker/local/docker-compose.yml
@@ -17,8 +17,8 @@ services:
tmpfs:
- /var/lib/mysql/:rw,noexec,nosuid
- mssql2017cu9:
- image: mcr.microsoft.com/mssql/server:2017-CU9-ubuntu
+ mssql2017cu17:
+ image: mcr.microsoft.com/mssql/server:2017-CU17-ubuntu
environment:
ACCEPT_EULA: Y
SA_PASSWORD: "Test1234!"
@@ -598,10 +598,10 @@ services:
fi
"
- prepare_functional_mssql2017cu9:
+ prepare_functional_mssql2017cu17:
image: alpine:3.8
links:
- - mssql2017cu9
+ - mssql2017cu17
- redis4
- memcached1-5
command: >
@@ -610,12 +610,12 @@ services:
set -x
fi
echo Waiting for database start...;
- while ! nc -z mssql2017cu9 1433; do
+ while ! nc -z mssql2017cu17 1433; do
sleep 1;
done;
echo Database is up;
"
- functional_mssql2017cu9:
+ functional_mssql2017cu17:
image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
user: ${HOST_UID}
volumes:
@@ -630,7 +630,7 @@ services:
typo3DatabaseUsername: SA
typo3DatabasePort: 1433
typo3DatabaseCharset: utf-8
- typo3DatabaseHost: mssql2017cu9
+ typo3DatabaseHost: mssql2017cu17
typo3TestingRedisHost: redis4
typo3TestingMemcachedHost: memcached1-5
working_dir: ${CORE_ROOT}
--
GitLab