Merge remote-tracking branch 'origin/release/V3.4' into feature-3.4/APPS-594_Intermittent_openPage_no

scripts/mysql/common.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -e
-CONTAINER_NAME=alfresco-db-mysql
-
-MYSQL_USER=alfresco
-MYSQL_ROOT_PASSWORD=alfresco
-MYSQL_DATABASE=alfresco
-
-MYSQL_HOST=127.0.0.1
-MYSQL_PORT=3306

scripts/mysql/start.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-set -e
-
-. $(dirname "${BASH_SOURCE[0]}")/common.sh
-
-echo "============================================"
-echo "Generate custom config file"
-echo "============================================"
-rm -rf /tmp/Docker
-mkdir -p /tmp/Docker
-
-echo "
-[mysqld]
-collation-server = utf8_unicode_ci
-character-set-server = utf8
-innodb_locks_unsafe_for_binlog = 1
-default_storage_engine = InnoDB
-max_connections = 275
-lock_wait_timeout = 5
-innodb_buffer_pool_size = 1G
-innodb_additional_mem_pool_size = 16M
-innodb_log_file_size = 256M
-innodb_log_buffer_size = 16M
-innodb_data_file_path = ibdata1:64M:autoextend
-innodb_autoextend_increment = 64
-init_file=/etc/mysql/conf.d/init-file.sql
-" > /tmp/Docker/config-file.cnf
-
-echo "
-GRANT ALL on $MYSQL_USER.* to '$MYSQL_DATABASE'@'%' identified by '$MYSQL_ROOT_PASSWORD' with grant option;
-FLUSH HOSTS;
-FLUSH PRIVILEGES;
-" > /tmp/Docker/init-file.sql
-
-echo "============================================"
-echo "Pulling and Running $1"
-echo "============================================"
-sg docker "docker run -p $MYSQL_PORT:3306 -v /tmp/Docker:/etc/mysql/conf.d --name $CONTAINER_NAME -e MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD -e MYSQL_USER=$MYSQL_USER -e MYSQL_DATABASE=$MYSQL_DATABASE -d $1"
-
-sleep 120
-
-# The init_file option should be enough, but some old version of MariaDB do not honor it...
-docker exec -t $CONTAINER_NAME mysql -v -h $MYSQL_HOST --port=$MYSQL_PORT -u root --password=$MYSQL_ROOT_PASSWORD -e "source /etc/mysql/conf.d/init-file.sql"

travis/.travis.integration-test-MySQL.yml

@@ -9,15 +9,14 @@ jobs:
     services: docker
     stage: Tests
     if: branch =~ /(release\/.*$|master)/ OR commit_message =~ /\[execute tests on MySQL\]/
-    before_install:
-      - source ./scripts/mysql/start.sh mysql:5.6.26
+    install:
+      - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco  mysql:5.7.23 --transaction-isolation='READ-COMMITTED'
       - docker run -d -p 61617:61617 -p 5673:5673 alfresco/alfresco-activemq:5.15.8
     script:
-      - travis_retry travis_wait 80 mvn -B -q clean install -Puse-mysql -DskipTests  -Dskip.integrationtests=false -Dmy.db.name=alfresco -Dmy.db.port=3306 -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - travis_retry travis_wait 80 mvn -B -q clean install -Puse-mysql -DskipTests -Dskip.integrationtests=false -Dmy.db.name=alfresco -Dmy.db.port=3307 -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
   - <<: *integration_test_on_MYSQL
     name: "Enterprise Integrations Tests on MySQL"
     install:
-      - travis_retry travis_wait 60 mvn -B -q clean install ${MVN_SKIP} -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-    script:
-      - travis_retry travis_wait 80 mvn -B -q clean install -Puse-mysql -DskipTests -Dskip.integrationtests=false  -Dmy.db.name=alfresco -Dmy.db.port=3306 -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - travis_retry travis_wait 60 mvn -B -q clean install ${MVN_SKIP} -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -am
+    script: travis_retry travis_wait 80 mvn -B -q clean install ${MVN_SKIP} -Puse-mysql -Dskip.integrationtests=false -Dmy.db.name=alfresco -Dmy.db.port=3307 -f rm-enterprise/pom.xml -amd -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn