diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36a069c1c998491e2a9aa699b52ee92da8dcc4c9..88da30cbd83cad8c4fc6ff9de2b2b9cf67f0bcc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,6 +107,9 @@ default: rules: - if: $PERFORMANCE_TEST != "1" +.mongodb-install: &mongodb-install |- + apt update && apt install autoconf file g++ gcc make pkg-config re2c --yes && docker-php-ext-pecl-install mongodb + ################ # Stages @@ -285,7 +288,7 @@ default: paths: - vendor/ script: - - docker-php-ext-pecl-install mongodb + - *mongodb-install - composer validate - composer install - if [ -n "$COMPOSER_UPDATE" ]; then diff --git a/.gitlab-ci/pipeline-test-only.yml b/.gitlab-ci/pipeline-test-only.yml index de9ea854645bcc185fb0e6bd917b7bbbcd6c566a..b82f0f056098faf07a35607dee01233efe38bb73 100644 --- a/.gitlab-ci/pipeline-test-only.yml +++ b/.gitlab-ci/pipeline-test-only.yml @@ -44,7 +44,7 @@ variables: [[ $_TARGET_DB == mariadb* ]] && export SIMPLETEST_DB=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE?module=mysql [[ $_TARGET_DB == pgsql* ]] && export SIMPLETEST_DB=pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@database/$POSTGRES_DB?module=pgsql - echo -e "\e[0Ksection_start:`date +%s`:my_first_section[collapsed=true]\r\e[0KInstall PHP Extension" - - pecl install mongodb && docker-php-ext-enable mongodb + - *mongodb-install - echo -e "\e[0Ksection_end:`date +%s`:my_first_section\r\e[0K" - $CI_PROJECT_DIR/.gitlab-ci/scripts/server-setup.sh script: diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml index d2a23987f0bf786681353af89c20f621acfacf30..62a8d211f4a3e3357d1112e445a8e10428506d32 100644 --- a/.gitlab-ci/pipeline.yml +++ b/.gitlab-ci/pipeline.yml @@ -27,7 +27,7 @@ default: [[ $_TARGET_DB == pgsql* ]] && export SIMPLETEST_DB=pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@database/$POSTGRES_DB?module=pgsql - echo "SIMPLETEST_DB = $SIMPLETEST_DB" - echo -e "\e[0Ksection_start:`date +%s`:my_first_section[collapsed=true]\r\e[0KInstall PHP Extension" - - pecl install mongodb && docker-php-ext-enable mongodb + - *mongodb-install - echo -e "\e[0Ksection_end:`date +%s`:my_first_section\r\e[0K" - $CI_PROJECT_DIR/.gitlab-ci/scripts/server-setup.sh after_script: @@ -67,7 +67,6 @@ variables: MYSQL_DATABASE: mysql MYSQL_USER: drupaltestbot MYSQL_PASSWORD: drupaltestbotpw - COMPOSER_EXTRA: --ignore-platform-req=ext-mongodb POSTGRES_DB: drupaltestbot POSTGRES_USER: drupaltestbot POSTGRES_PASSWORD: drupaltestbotpw