From c818970d6e8f8f1ef9f0025c37b7bd63e59309f5 Mon Sep 17 00:00:00 2001 From: Tobias Gaertner Date: Tue, 1 Feb 2022 13:14:00 +0100 Subject: [PATCH] install and use wait-for-it for functional tests (#373) It might happen, when starting the fuctional test that the database service container is not ready yet. This patch provides an extra timeout to wait for the service to make sure the test does not fail because of missing database. --- .gitlab/build/docker_install.sh | 2 +- .gitlab/pipeline/jobs/func-php7.2-v10.yml | 2 +- .gitlab/pipeline/jobs/func-php7.2-v9.yml | 2 +- .gitlab/pipeline/jobs/func-php7.3-v10.yml | 2 +- .gitlab/pipeline/jobs/func-php7.3-v9.yml | 2 +- .gitlab/pipeline/jobs/func-php7.4-v10.yml | 2 +- .gitlab/pipeline/jobs/func-php7.4-v9.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab/build/docker_install.sh b/.gitlab/build/docker_install.sh index ef0bccf..ba4d7f8 100644 --- a/.gitlab/build/docker_install.sh +++ b/.gitlab/build/docker_install.sh @@ -5,7 +5,7 @@ set -xe apt-get update -yqq -apt-get install git libzip-dev unzip parallel libxml2-utils wget -yqq +apt-get install git libzip-dev unzip parallel libxml2-utils wget wait-for-it -yqq php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/local/bin/ --filename=composer chmod +x /usr/local/bin/composer diff --git a/.gitlab/pipeline/jobs/func-php7.2-v10.yml b/.gitlab/pipeline/jobs/func-php7.2-v10.yml index 204b601..d0363a4 100644 --- a/.gitlab/pipeline/jobs/func-php7.2-v10.yml +++ b/.gitlab/pipeline/jobs/func-php7.2-v10.yml @@ -9,4 +9,4 @@ func-php7.2-v10: - php-lint-php7.2 script: - composer require --no-progress typo3/minimal:"^10.4" - - composer ci:tests:functional + - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php7.2-v9.yml b/.gitlab/pipeline/jobs/func-php7.2-v9.yml index 3229fbe..24dfe16 100644 --- a/.gitlab/pipeline/jobs/func-php7.2-v9.yml +++ b/.gitlab/pipeline/jobs/func-php7.2-v9.yml @@ -10,4 +10,4 @@ func-php7.2-v9: - php-lint-php7.2 script: - composer require --no-progress typo3/minimal:"^9.5" - - composer ci:tests:functional + - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php7.3-v10.yml b/.gitlab/pipeline/jobs/func-php7.3-v10.yml index 2f2fa29..4432c82 100644 --- a/.gitlab/pipeline/jobs/func-php7.3-v10.yml +++ b/.gitlab/pipeline/jobs/func-php7.3-v10.yml @@ -9,4 +9,4 @@ func-php7.3-v10: - php-lint-php7.3 script: - composer require --no-progress typo3/minimal:"^10.4" - - composer ci:tests:functional + - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php7.3-v9.yml b/.gitlab/pipeline/jobs/func-php7.3-v9.yml index 7f14895..cddda3c 100644 --- a/.gitlab/pipeline/jobs/func-php7.3-v9.yml +++ b/.gitlab/pipeline/jobs/func-php7.3-v9.yml @@ -10,4 +10,4 @@ func-php7.3-v9: - php-lint-php7.3 script: - composer require --no-progress typo3/minimal:"^9.5" - - composer ci:tests:functional + - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php7.4-v10.yml b/.gitlab/pipeline/jobs/func-php7.4-v10.yml index 6c30e38..0df7018 100644 --- a/.gitlab/pipeline/jobs/func-php7.4-v10.yml +++ b/.gitlab/pipeline/jobs/func-php7.4-v10.yml @@ -9,4 +9,4 @@ func-php7.4-v10: - php-lint-php7.4 script: - composer require --no-progress typo3/minimal:"^10.4" - - composer ci:tests:functional + - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php7.4-v9.yml b/.gitlab/pipeline/jobs/func-php7.4-v9.yml index 03bcd82..58d545f 100644 --- a/.gitlab/pipeline/jobs/func-php7.4-v9.yml +++ b/.gitlab/pipeline/jobs/func-php7.4-v9.yml @@ -10,4 +10,4 @@ func-php7.4-v9: - php-lint-php7.4 script: - composer require --no-progress typo3/minimal:"^9.5" - - composer ci:tests:functional + - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional