From 7aabb7a0b1ca2d82417629829aeb0742d6f7f6bb Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 26 Oct 2020 16:53:27 +0200 Subject: [PATCH 01/40] add the tests to run on my sql [execute tests on MySQL] --- .travis.yml | 15 +++++++++++++-- scripts/my_sql_travis.sql | 7 +++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 scripts/my_sql_travis.sql diff --git a/.travis.yml b/.travis.yml index e1d2c83088..fc68178163 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,13 +63,24 @@ jobs: - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community Integrations Tests on MySQL" + services: mysql stage: Tests + if: branch IN (release\/V2.7.*, hotfix-2.7\/.*) OR commit_message =~ /\[execute tests on MySQL\]/ + before_install: + - mysql -u root --password="" < scripts/my_sql_travis.sql script: - - echo "Community Integrations Tests on MySQL" + - 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 + - name: "Enterprise Integrations Tests on MySQL" + services: mysql stage: Tests + if: branch IN (release\/V2.7.*, hotfix-2.7\/.*) OR commit_message =~ /\[execute tests on MySQL\]/ + before_install: + - mysql -u root --password="" < scripts/my_sql_travis.sql + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn script: - - echo "Enterprise Integrations Tests on MySQL" + - 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 - name: "Community Rest API Tests" stage: Tests diff --git a/scripts/my_sql_travis.sql b/scripts/my_sql_travis.sql new file mode 100644 index 0000000000..2c55a1a3d3 --- /dev/null +++ b/scripts/my_sql_travis.sql @@ -0,0 +1,7 @@ +# Create alfresco +CREATE USER 'alfresco' IDENTIFIED BY 'alfresco'; +GRANT ALL on alfresco.* to 'alfresco'@'%' identified by 'alfresco' with grant option; +FLUSH HOSTS; +FLUSH PRIVILEGES; +# Create DB +CREATE DATABASE IF NOT EXISTS `alfresco` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; \ No newline at end of file From bdb784d5aecd4a9fcfebd0bf9422a0a1b9b6e7f0 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 28 Oct 2020 17:11:05 +0200 Subject: [PATCH 02/40] use the same approach to start mysql as in bamboo [execute tests on MySQL] --- .travis.yml | 5 ++--- scripts/mysql/common.sh | 18 +++++++++++++++++ scripts/mysql/start.sh | 44 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 scripts/mysql/common.sh create mode 100644 scripts/mysql/start.sh diff --git a/.travis.yml b/.travis.yml index fc68178163..56d3523566 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,11 +72,10 @@ jobs: - 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 - name: "Enterprise Integrations Tests on MySQL" - services: mysql + services: docker stage: Tests if: branch IN (release\/V2.7.*, hotfix-2.7\/.*) OR commit_message =~ /\[execute tests on MySQL\]/ - before_install: - - mysql -u root --password="" < scripts/my_sql_travis.sql + before_install: source scripts/mysql/start.sh mysql:5.6.26 install: - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn script: diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh new file mode 100644 index 0000000000..d10c45f3e7 --- /dev/null +++ b/scripts/mysql/common.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +CONTAINER_NAME=alfresco-db-mysql + +MYSQL_USER=alfresco +MYSQL_ROOT_PASSWORD=alfresco +MYSQL_DATABASE=alfresco + +MYSQL_HOST=127.0.0.1 +MYSQL_PORT=3306 + +usage () { + echo "Usage: $0 " +} + +if [[ $# -ne 1 ]]; then + usage + exit 1 +fi \ No newline at end of file diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh new file mode 100644 index 0000000000..14b4e0f8e8 --- /dev/null +++ b/scripts/mysql/start.sh @@ -0,0 +1,44 @@ +#!/bin/bash +set -e + +. $(dirname $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" \ No newline at end of file From d50b9e733a93411eb69ceb599c3e2c1526ebd6f2 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 28 Oct 2020 20:25:06 +0200 Subject: [PATCH 03/40] fix the path for common script [execute tests on MySQL] --- scripts/mysql/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh index 14b4e0f8e8..e28461999a 100644 --- a/scripts/mysql/start.sh +++ b/scripts/mysql/start.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -. $(dirname $0)/common.sh +./common.sh echo "============================================" echo "Generate custom config file" From 1f953b9e8aaf2fb8f58f8b9c686e58467a559198 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Thu, 29 Oct 2020 08:28:45 +0200 Subject: [PATCH 04/40] attempt to fix the path for common script [execute tests on MySQL] --- scripts/mysql/start.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh index e28461999a..8a4fcfb71a 100644 --- a/scripts/mysql/start.sh +++ b/scripts/mysql/start.sh @@ -1,7 +1,8 @@ #!/bin/bash set -e - -./common.sh +DIRECTORY=`dirname $0` +echo $DIRECTORY +. $(dirname $0)/common.sh echo "============================================" echo "Generate custom config file" @@ -35,8 +36,7 @@ FLUSH PRIVILEGES; 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" +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 From f4817d743fa55fb7e0cfb74f0d00b4d7c4d65214 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Thu, 29 Oct 2020 14:35:43 +0200 Subject: [PATCH 05/40] attempt to fix common path [execute tests on MySQL] --- scripts/mysql/common.sh | 12 ++---------- scripts/mysql/start.sh | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh index d10c45f3e7..a9cafd07e6 100644 --- a/scripts/mysql/common.sh +++ b/scripts/mysql/common.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -xe CONTAINER_NAME=alfresco-db-mysql MYSQL_USER=alfresco @@ -6,13 +7,4 @@ MYSQL_ROOT_PASSWORD=alfresco MYSQL_DATABASE=alfresco MYSQL_HOST=127.0.0.1 -MYSQL_PORT=3306 - -usage () { - echo "Usage: $0 " -} - -if [[ $# -ne 1 ]]; then - usage - exit 1 -fi \ No newline at end of file +MYSQL_PORT=3306 \ No newline at end of file diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh index 8a4fcfb71a..fcb8934aa2 100644 --- a/scripts/mysql/start.sh +++ b/scripts/mysql/start.sh @@ -2,7 +2,7 @@ set -e DIRECTORY=`dirname $0` echo $DIRECTORY -. $(dirname $0)/common.sh + $(dirname "${BASH_SOURCE[0]}")/common.sh echo "============================================" echo "Generate custom config file" From d70493a8718ba4c4b2ee25178ca26fe27b8fc910 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Thu, 29 Oct 2020 20:57:11 +0200 Subject: [PATCH 06/40] Make common.sh executable [execute tests on MySQL] --- scripts/mysql/common.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/mysql/common.sh diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh old mode 100644 new mode 100755 From ec8473b7a3af0ba42ccc3eb09f00ea0e7bbb40bc Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 30 Oct 2020 08:00:58 +0200 Subject: [PATCH 07/40] attempt to debug the docker command --- scripts/mysql/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh index fcb8934aa2..09c7ff1dad 100644 --- a/scripts/mysql/start.sh +++ b/scripts/mysql/start.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -xe DIRECTORY=`dirname $0` echo $DIRECTORY $(dirname "${BASH_SOURCE[0]}")/common.sh From 0f58244d1ae44c2bd157de969686c7a64db528d3 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 30 Oct 2020 12:57:10 +0200 Subject: [PATCH 08/40] fix setting the variables [execute tests on MySQL] --- scripts/mysql/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh index 09c7ff1dad..38a705febd 100644 --- a/scripts/mysql/start.sh +++ b/scripts/mysql/start.sh @@ -2,7 +2,7 @@ set -xe DIRECTORY=`dirname $0` echo $DIRECTORY - $(dirname "${BASH_SOURCE[0]}")/common.sh +. $(dirname "${BASH_SOURCE[0]}")/common.sh echo "============================================" echo "Generate custom config file" From 52197a79b273d3e1ec4580199446991036e13fa6 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 30 Oct 2020 16:18:47 +0200 Subject: [PATCH 09/40] some refactoring [execute tests on MySQL] --- .travis.yml | 23 +++---------------- scripts/my_sql_travis.sql | 7 ------ scripts/mysql/common.sh | 2 +- scripts/mysql/start.sh | 5 ++-- .../travis-env-vars.yml | 0 travis/travis_integration_test_MySQL.yml | 23 +++++++++++++++++++ 6 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 scripts/my_sql_travis.sql rename travis-env-vars.yml => travis/travis-env-vars.yml (100%) create mode 100644 travis/travis_integration_test_MySQL.yml diff --git a/.travis.yml b/.travis.yml index 56d3523566..654183c30e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ import: - - source: travis-env-vars.yml + - source: travis/travis-env-vars.yml + - source: travis/travis_integration_test_MySQL.yml + os: linux dist: xenial language: java @@ -62,25 +64,6 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Integrations Tests on MySQL" - services: mysql - stage: Tests - if: branch IN (release\/V2.7.*, hotfix-2.7\/.*) OR commit_message =~ /\[execute tests on MySQL\]/ - before_install: - - mysql -u root --password="" < scripts/my_sql_travis.sql - 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 - - - name: "Enterprise Integrations Tests on MySQL" - services: docker - stage: Tests - if: branch IN (release\/V2.7.*, hotfix-2.7\/.*) OR commit_message =~ /\[execute tests on MySQL\]/ - before_install: source scripts/mysql/start.sh mysql:5.6.26 - install: - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 - - name: "Community Rest API Tests" stage: Tests before_install: diff --git a/scripts/my_sql_travis.sql b/scripts/my_sql_travis.sql deleted file mode 100644 index 2c55a1a3d3..0000000000 --- a/scripts/my_sql_travis.sql +++ /dev/null @@ -1,7 +0,0 @@ -# Create alfresco -CREATE USER 'alfresco' IDENTIFIED BY 'alfresco'; -GRANT ALL on alfresco.* to 'alfresco'@'%' identified by 'alfresco' with grant option; -FLUSH HOSTS; -FLUSH PRIVILEGES; -# Create DB -CREATE DATABASE IF NOT EXISTS `alfresco` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; \ No newline at end of file diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh index a9cafd07e6..f6ed525df9 100755 --- a/scripts/mysql/common.sh +++ b/scripts/mysql/common.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -xe +set -e CONTAINER_NAME=alfresco-db-mysql MYSQL_USER=alfresco diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh index 38a705febd..155572ff0e 100644 --- a/scripts/mysql/start.sh +++ b/scripts/mysql/start.sh @@ -1,7 +1,6 @@ #!/bin/bash -set -xe -DIRECTORY=`dirname $0` -echo $DIRECTORY +set -e + . $(dirname "${BASH_SOURCE[0]}")/common.sh echo "============================================" diff --git a/travis-env-vars.yml b/travis/travis-env-vars.yml similarity index 100% rename from travis-env-vars.yml rename to travis/travis-env-vars.yml diff --git a/travis/travis_integration_test_MySQL.yml b/travis/travis_integration_test_MySQL.yml new file mode 100644 index 0000000000..60bb68dd92 --- /dev/null +++ b/travis/travis_integration_test_MySQL.yml @@ -0,0 +1,23 @@ +###Running the Integration tests on MySQL +## - stable branch +## - on demand with commit message [execute tests on MySQL] + +jobs: + include: + - &integration_test_on_MYSQL + name: "Community Integrations Tests on MySQL" + services: mysql + stage: Tests + if: branch =~ /release\/.*/ OR commit_message =~ /\[execute tests on MySQL\]/ + before_install: source ./scripts/mysql/start.sh mysql:5.6.26 + 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 + + - <<: *integration_test_on_MYSQL + name: "Enterprise Integrations Tests on MySQL" + services: docker + stage: Tests + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 From 6b3c6eb224a0adae3560d307d2f61b4f0e6a6bf1 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 30 Oct 2020 17:05:46 +0200 Subject: [PATCH 10/40] fix community failure[execute tests on MySQL] --- travis/travis_integration_test_MySQL.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/travis/travis_integration_test_MySQL.yml b/travis/travis_integration_test_MySQL.yml index 60bb68dd92..8a9a5e75ed 100644 --- a/travis/travis_integration_test_MySQL.yml +++ b/travis/travis_integration_test_MySQL.yml @@ -1,14 +1,14 @@ -###Running the Integration tests on MySQL -## - stable branch +### Integration tests on MySQL are running: +## - on stable branch ## - on demand with commit message [execute tests on MySQL] jobs: include: - &integration_test_on_MYSQL name: "Community Integrations Tests on MySQL" - services: mysql + services: docker stage: Tests - if: branch =~ /release\/.*/ OR commit_message =~ /\[execute tests on MySQL\]/ + if: branch =~ /(release\/.*$|master)/ OR commit_message =~ /\[execute tests on MySQL\]/ before_install: source ./scripts/mysql/start.sh mysql:5.6.26 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 From 0ead50f896f6f1a6d2b750d194fcf3c1eab97640 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Sun, 1 Nov 2020 20:56:19 +0200 Subject: [PATCH 11/40] code review changes [execute tests on MySQL] --- travis/travis_integration_test_MySQL.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/travis/travis_integration_test_MySQL.yml b/travis/travis_integration_test_MySQL.yml index 8a9a5e75ed..9f20b1660b 100644 --- a/travis/travis_integration_test_MySQL.yml +++ b/travis/travis_integration_test_MySQL.yml @@ -15,8 +15,6 @@ jobs: - <<: *integration_test_on_MYSQL name: "Enterprise Integrations Tests on MySQL" - services: docker - stage: Tests install: - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn script: From 3b7afde775190e0aa07e554c6c75f113c77b0f92 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 26 Oct 2020 16:53:27 +0200 Subject: [PATCH 12/40] add the tests to run on my sql [execute tests on MySQL] --- .travis.yml | 15 +++++++++++++-- scripts/my_sql_travis.sql | 7 +++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 scripts/my_sql_travis.sql diff --git a/.travis.yml b/.travis.yml index 1ba277c630..634ae1d153 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,13 +64,24 @@ jobs: - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Community Integrations Tests on MySQL" + services: mysql stage: Tests + if: branch IN (release\/V2.7.*, hotfix-2.7\/.*) OR commit_message =~ /\[execute tests on MySQL\]/ + before_install: + - mysql -u root --password="" < scripts/my_sql_travis.sql script: - - echo "Community Integrations Tests on MySQL" + - 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 + - name: "Enterprise Integrations Tests on MySQL" + services: mysql stage: Tests + if: branch IN (release\/V2.7.*, hotfix-2.7\/.*) OR commit_message =~ /\[execute tests on MySQL\]/ + before_install: + - mysql -u root --password="" < scripts/my_sql_travis.sql + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn script: - - echo "Enterprise Integrations Tests on MySQL" + - 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 - name: "Community Rest API Tests" stage: Tests diff --git a/scripts/my_sql_travis.sql b/scripts/my_sql_travis.sql new file mode 100644 index 0000000000..2c55a1a3d3 --- /dev/null +++ b/scripts/my_sql_travis.sql @@ -0,0 +1,7 @@ +# Create alfresco +CREATE USER 'alfresco' IDENTIFIED BY 'alfresco'; +GRANT ALL on alfresco.* to 'alfresco'@'%' identified by 'alfresco' with grant option; +FLUSH HOSTS; +FLUSH PRIVILEGES; +# Create DB +CREATE DATABASE IF NOT EXISTS `alfresco` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; \ No newline at end of file From 4e4e304723c035eaa31f34b8265c24f008f0bda0 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Mon, 2 Nov 2020 07:56:35 +0200 Subject: [PATCH 13/40] Merge pull request #1265 from Alfresco/feature-2.7/APPS-234_IntegrationTestsOnMySQL Feature 2.7/apps 234 integration tests on my sql # Conflicts: # .travis.yml --- .travis.yml | 24 ++--------- scripts/mysql/common.sh | 10 +++++ scripts/mysql/start.sh | 43 +++++++++++++++++++ .../travis-env-vars.yml | 0 travis/travis_integration_test_MySQL.yml | 21 +++++++++ 5 files changed, 77 insertions(+), 21 deletions(-) create mode 100755 scripts/mysql/common.sh create mode 100644 scripts/mysql/start.sh rename travis-env-vars.yml => travis/travis-env-vars.yml (100%) create mode 100644 travis/travis_integration_test_MySQL.yml diff --git a/.travis.yml b/.travis.yml index 634ae1d153..0aae63c89a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ import: - - source: travis-env-vars.yml + - source: travis/travis-env-vars.yml + - source: travis/travis_integration_test_MySQL.yml + os: linux dist: xenial language: java @@ -63,26 +65,6 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Integrations Tests on MySQL" - services: mysql - stage: Tests - if: branch IN (release\/V2.7.*, hotfix-2.7\/.*) OR commit_message =~ /\[execute tests on MySQL\]/ - before_install: - - mysql -u root --password="" < scripts/my_sql_travis.sql - 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 - - - name: "Enterprise Integrations Tests on MySQL" - services: mysql - stage: Tests - if: branch IN (release\/V2.7.*, hotfix-2.7\/.*) OR commit_message =~ /\[execute tests on MySQL\]/ - before_install: - - mysql -u root --password="" < scripts/my_sql_travis.sql - install: - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 - - name: "Community Rest API Tests" stage: Tests before_install: diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh new file mode 100755 index 0000000000..f6ed525df9 --- /dev/null +++ b/scripts/mysql/common.sh @@ -0,0 +1,10 @@ +#!/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 \ No newline at end of file diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh new file mode 100644 index 0000000000..155572ff0e --- /dev/null +++ b/scripts/mysql/start.sh @@ -0,0 +1,43 @@ +#!/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" \ No newline at end of file diff --git a/travis-env-vars.yml b/travis/travis-env-vars.yml similarity index 100% rename from travis-env-vars.yml rename to travis/travis-env-vars.yml diff --git a/travis/travis_integration_test_MySQL.yml b/travis/travis_integration_test_MySQL.yml new file mode 100644 index 0000000000..9f20b1660b --- /dev/null +++ b/travis/travis_integration_test_MySQL.yml @@ -0,0 +1,21 @@ +### Integration tests on MySQL are running: +## - on stable branch +## - on demand with commit message [execute tests on MySQL] + +jobs: + include: + - &integration_test_on_MYSQL + name: "Community Integrations Tests on MySQL" + 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 + 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 + + - <<: *integration_test_on_MYSQL + name: "Enterprise Integrations Tests on MySQL" + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 From a13b5c98bb81c99768c7d517817abef0c66b1c04 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Mon, 2 Nov 2020 07:56:35 +0200 Subject: [PATCH 14/40] Merge pull request #1265 from Alfresco/feature-2.7/APPS-234_IntegrationTestsOnMySQL [execute tests on MySQL] Feature 2.7/apps 234 integration tests on my sql # Conflicts: # .travis.yml # Conflicts: # .travis.yml --- .travis.yml | 21 +++------ scripts/mysql/common.sh | 10 +++++ scripts/mysql/start.sh | 43 +++++++++++++++++++ .../travis-env-vars.yml | 0 travis/travis_integration_test_MySQL.yml | 21 +++++++++ 5 files changed, 81 insertions(+), 14 deletions(-) create mode 100755 scripts/mysql/common.sh create mode 100644 scripts/mysql/start.sh rename travis-env-vars.yml => travis/travis-env-vars.yml (100%) create mode 100644 travis/travis_integration_test_MySQL.yml diff --git a/.travis.yml b/.travis.yml index 86eeac0a9f..fa8ba16e3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ import: - - source: travis-env-vars.yml + - source: travis/travis-env-vars.yml + - source: travis/travis_integration_test_MySQL.yml + os: linux dist: xenial language: java @@ -62,20 +64,11 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_COMMUNITY_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -84,7 +77,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -102,7 +95,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} @@ -130,7 +123,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh new file mode 100755 index 0000000000..f6ed525df9 --- /dev/null +++ b/scripts/mysql/common.sh @@ -0,0 +1,10 @@ +#!/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 \ No newline at end of file diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh new file mode 100644 index 0000000000..155572ff0e --- /dev/null +++ b/scripts/mysql/start.sh @@ -0,0 +1,43 @@ +#!/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" \ No newline at end of file diff --git a/travis-env-vars.yml b/travis/travis-env-vars.yml similarity index 100% rename from travis-env-vars.yml rename to travis/travis-env-vars.yml diff --git a/travis/travis_integration_test_MySQL.yml b/travis/travis_integration_test_MySQL.yml new file mode 100644 index 0000000000..9f20b1660b --- /dev/null +++ b/travis/travis_integration_test_MySQL.yml @@ -0,0 +1,21 @@ +### Integration tests on MySQL are running: +## - on stable branch +## - on demand with commit message [execute tests on MySQL] + +jobs: + include: + - &integration_test_on_MYSQL + name: "Community Integrations Tests on MySQL" + 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 + 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 + + - <<: *integration_test_on_MYSQL + name: "Enterprise Integrations Tests on MySQL" + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 From 78ffaa3f779056ed6f4959349db5421e6fdb37e1 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Mon, 2 Nov 2020 07:56:35 +0200 Subject: [PATCH 15/40] Merge pull request #1265 from Alfresco/feature-2.7/APPS-234_IntegrationTestsOnMySQL [execute tests on MySQL] Feature 2.7/apps 234 integration tests on my sql # Conflicts: # .travis.yml # Conflicts: # .travis.yml --- .travis.yml | 21 +++------ scripts/mysql/common.sh | 10 +++++ scripts/mysql/start.sh | 43 +++++++++++++++++++ .../travis-env-vars.yml | 0 travis/travis_integration_test_MySQL.yml | 21 +++++++++ 5 files changed, 81 insertions(+), 14 deletions(-) create mode 100755 scripts/mysql/common.sh create mode 100644 scripts/mysql/start.sh rename travis-env-vars.yml => travis/travis-env-vars.yml (100%) create mode 100644 travis/travis_integration_test_MySQL.yml diff --git a/.travis.yml b/.travis.yml index 86eeac0a9f..fa8ba16e3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ import: - - source: travis-env-vars.yml + - source: travis/travis-env-vars.yml + - source: travis/travis_integration_test_MySQL.yml + os: linux dist: xenial language: java @@ -62,20 +64,11 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_COMMUNITY_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -84,7 +77,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -102,7 +95,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} @@ -130,7 +123,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh new file mode 100755 index 0000000000..f6ed525df9 --- /dev/null +++ b/scripts/mysql/common.sh @@ -0,0 +1,10 @@ +#!/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 \ No newline at end of file diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh new file mode 100644 index 0000000000..155572ff0e --- /dev/null +++ b/scripts/mysql/start.sh @@ -0,0 +1,43 @@ +#!/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" \ No newline at end of file diff --git a/travis-env-vars.yml b/travis/travis-env-vars.yml similarity index 100% rename from travis-env-vars.yml rename to travis/travis-env-vars.yml diff --git a/travis/travis_integration_test_MySQL.yml b/travis/travis_integration_test_MySQL.yml new file mode 100644 index 0000000000..9f20b1660b --- /dev/null +++ b/travis/travis_integration_test_MySQL.yml @@ -0,0 +1,21 @@ +### Integration tests on MySQL are running: +## - on stable branch +## - on demand with commit message [execute tests on MySQL] + +jobs: + include: + - &integration_test_on_MYSQL + name: "Community Integrations Tests on MySQL" + 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 + 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 + + - <<: *integration_test_on_MYSQL + name: "Enterprise Integrations Tests on MySQL" + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 From bb93b1ce35435b7d1d0e364bd415ca375d934f39 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 15:11:31 +0200 Subject: [PATCH 16/40] revert unwanted changes --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa8ba16e3b..c1bf5571d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_COMMUNITY_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -77,7 +77,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_ENTERPRISE_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -95,7 +95,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} @@ -123,7 +123,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} From e0321117d72d6ee5c40315641b7464caa0fabf36 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 15:11:31 +0200 Subject: [PATCH 17/40] revert unwanted changes --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa8ba16e3b..c1bf5571d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_COMMUNITY_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -77,7 +77,7 @@ jobs: stage: Tests before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_ENTERPRISE_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml script: - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn @@ -95,7 +95,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $S3_COMMUNITY_INSTALLER_PATH $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communitySmokeRecords.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} @@ -123,7 +123,7 @@ jobs: target_paths: $TRAVIS_BUILD_NUMBER before_install: - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q - - travis_wait 5 bash scripts/downloadInstaller.sh $S3_ENTERPRISE_INSTALLER_PATH $AUTOMATION_UI_PATH/target + - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml script: - travis_wait 90 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS} From 8a57407192e0bfc4d0e6ef30bfd5041cb408a842 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 15:35:30 +0200 Subject: [PATCH 18/40] fix travis import [execute tests on MySQL] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0535bcf841..3eb352e4e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis_integration_tests_MySQL.yml + - source: travis/.travis-integration-tests-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial From c798847f3fbbad436243a7885caff558fe5cdb88 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 16:16:47 +0200 Subject: [PATCH 19/40] fix typo[execute tests on MySQL] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3eb352e4e8..36aa6949bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis-integration-tests-MySQL.yml + - source: travis/.travis-integration-test-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial From 279e475ab7058501966aacdc8a93a6829ba017e6 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 17:42:25 +0200 Subject: [PATCH 20/40] fix import of travis file [execute tests on MySQL] --- .travis.yml | 2 +- travis/{.travis-env-vars.yml => .travis.env-vars.yml} | 0 ...ration-test-MySQL.yml => .travis.integration-test-MySQL.yml} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename travis/{.travis-env-vars.yml => .travis.env-vars.yml} (100%) rename travis/{.travis-integration-test-MySQL.yml => .travis.integration-test-MySQL.yml} (100%) diff --git a/.travis.yml b/.travis.yml index 36aa6949bb..ea33c47959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis-integration-test-MySQL.yml + - source: travis/.travis.integration-test-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial diff --git a/travis/.travis-env-vars.yml b/travis/.travis.env-vars.yml similarity index 100% rename from travis/.travis-env-vars.yml rename to travis/.travis.env-vars.yml diff --git a/travis/.travis-integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml similarity index 100% rename from travis/.travis-integration-test-MySQL.yml rename to travis/.travis.integration-test-MySQL.yml From 9ad238bfbf19268b5a9523c7d41e8a2214df3eaf Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 20:18:44 +0200 Subject: [PATCH 21/40] remo the stages that are duplicated [execute tests on MySQL] --- travis/.travis.tests-stage.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/travis/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml index 7a20d80d9a..8edc813953 100644 --- a/travis/.travis.tests-stage.yml +++ b/travis/.travis.tests-stage.yml @@ -1,14 +1,5 @@ jobs: include: - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" stage: Tests install: From 53b642ad446b330468c3cf48b45eff852cedd197 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 09:00:46 +0200 Subject: [PATCH 22/40] Merge remote-tracking branch 'remotes/origin/release/V2.7' into feature-3.0/APPS-234_IntegrationTestsOnMySQL_no [execute tests on MySQL] # Conflicts: # .travis.env-vars.yml # .travis.yml # travis-env-vars.yml # travis/travis-env-vars.yml --- .travis.yml | 9 ++-- scripts/mysql/common.sh | 10 +++++ scripts/mysql/start.sh | 43 +++++++++++++++++++ .../.travis-env-vars.yml | 0 travis/.travis-integration-test-MySQL.yml | 21 +++++++++ .../.travis.publish-stage.yml | 0 .../.travis.release-stage.yml | 0 .../.travis.tests-stage.yml | 0 8 files changed, 79 insertions(+), 4 deletions(-) create mode 100755 scripts/mysql/common.sh create mode 100644 scripts/mysql/start.sh rename .travis.env-vars.yml => travis/.travis-env-vars.yml (100%) create mode 100644 travis/.travis-integration-test-MySQL.yml rename .travis.publish-stage.yml => travis/.travis.publish-stage.yml (100%) rename .travis.release-stage.yml => travis/.travis.release-stage.yml (100%) rename .travis.tests-stage.yml => travis/.travis.tests-stage.yml (100%) diff --git a/.travis.yml b/.travis.yml index b21ccbc3f3..ca460ce2b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ import: - - source: .travis.env-vars.yml - - source: .travis.tests-stage.yml - - source: .travis.release-stage.yml - - source: .travis.publish-stage.yml + - source: travis/.travis.env-vars.yml + - source: travis/.travis.tests-stage.yml + - source: travis/.travis_integration_tests_MySQL.yml + - source: travis/.travis.release-stage.yml + - source: travis/.travis.publish-stage.yml dist: xenial sudo: required language: java diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh new file mode 100755 index 0000000000..f6ed525df9 --- /dev/null +++ b/scripts/mysql/common.sh @@ -0,0 +1,10 @@ +#!/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 \ No newline at end of file diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh new file mode 100644 index 0000000000..155572ff0e --- /dev/null +++ b/scripts/mysql/start.sh @@ -0,0 +1,43 @@ +#!/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" \ No newline at end of file diff --git a/.travis.env-vars.yml b/travis/.travis-env-vars.yml similarity index 100% rename from .travis.env-vars.yml rename to travis/.travis-env-vars.yml diff --git a/travis/.travis-integration-test-MySQL.yml b/travis/.travis-integration-test-MySQL.yml new file mode 100644 index 0000000000..9f20b1660b --- /dev/null +++ b/travis/.travis-integration-test-MySQL.yml @@ -0,0 +1,21 @@ +### Integration tests on MySQL are running: +## - on stable branch +## - on demand with commit message [execute tests on MySQL] + +jobs: + include: + - &integration_test_on_MYSQL + name: "Community Integrations Tests on MySQL" + 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 + 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 + + - <<: *integration_test_on_MYSQL + name: "Enterprise Integrations Tests on MySQL" + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 diff --git a/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml similarity index 100% rename from .travis.publish-stage.yml rename to travis/.travis.publish-stage.yml diff --git a/.travis.release-stage.yml b/travis/.travis.release-stage.yml similarity index 100% rename from .travis.release-stage.yml rename to travis/.travis.release-stage.yml diff --git a/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml similarity index 100% rename from .travis.tests-stage.yml rename to travis/.travis.tests-stage.yml From 05587e1f6b7638159fabf1c07dd10c36bc91e019 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 15:35:30 +0200 Subject: [PATCH 23/40] fix travis import [execute tests on MySQL] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca460ce2b7..8870bd344d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis_integration_tests_MySQL.yml + - source: travis/.travis-integration-tests-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial From 45f87b35022ecba67e2d2bf5266fcde806e605d4 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 16:16:47 +0200 Subject: [PATCH 24/40] fix typo[execute tests on MySQL] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8870bd344d..ca244ac488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis-integration-tests-MySQL.yml + - source: travis/.travis-integration-test-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial From ea6d5eb1166636edd7572efceb1dd79131243c55 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 17:42:25 +0200 Subject: [PATCH 25/40] fix import of travis file [execute tests on MySQL] --- .travis.yml | 2 +- travis/{.travis-env-vars.yml => .travis.env-vars.yml} | 0 ...ration-test-MySQL.yml => .travis.integration-test-MySQL.yml} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename travis/{.travis-env-vars.yml => .travis.env-vars.yml} (100%) rename travis/{.travis-integration-test-MySQL.yml => .travis.integration-test-MySQL.yml} (100%) diff --git a/.travis.yml b/.travis.yml index ca244ac488..66c2efeba5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis-integration-test-MySQL.yml + - source: travis/.travis.integration-test-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial diff --git a/travis/.travis-env-vars.yml b/travis/.travis.env-vars.yml similarity index 100% rename from travis/.travis-env-vars.yml rename to travis/.travis.env-vars.yml diff --git a/travis/.travis-integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml similarity index 100% rename from travis/.travis-integration-test-MySQL.yml rename to travis/.travis.integration-test-MySQL.yml From 1428fb3b669454502678067307af28cd9667a4ce Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 20:18:44 +0200 Subject: [PATCH 26/40] remo the stages that are duplicated [execute tests on MySQL] --- travis/.travis.tests-stage.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/travis/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml index 7a20d80d9a..8edc813953 100644 --- a/travis/.travis.tests-stage.yml +++ b/travis/.travis.tests-stage.yml @@ -1,14 +1,5 @@ jobs: include: - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" stage: Tests install: From 62ff55f1047b9e4e0b4ad7c8c5992a40fce0acda Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 09:00:46 +0200 Subject: [PATCH 27/40] Merge remote-tracking branch 'remotes/origin/release/V2.7' into feature-3.0/APPS-234_IntegrationTestsOnMySQL_no [execute tests on MySQL] # Conflicts: # .travis.env-vars.yml # .travis.yml # travis-env-vars.yml # travis/travis-env-vars.yml --- .travis.yml | 9 ++-- scripts/mysql/common.sh | 10 +++++ scripts/mysql/start.sh | 43 +++++++++++++++++++ .../.travis-env-vars.yml | 0 travis/.travis-integration-test-MySQL.yml | 21 +++++++++ .../.travis.publish-stage.yml | 0 .../.travis.release-stage.yml | 0 .../.travis.tests-stage.yml | 0 8 files changed, 79 insertions(+), 4 deletions(-) create mode 100755 scripts/mysql/common.sh create mode 100644 scripts/mysql/start.sh rename .travis.env-vars.yml => travis/.travis-env-vars.yml (100%) create mode 100644 travis/.travis-integration-test-MySQL.yml rename .travis.publish-stage.yml => travis/.travis.publish-stage.yml (100%) rename .travis.release-stage.yml => travis/.travis.release-stage.yml (100%) rename .travis.tests-stage.yml => travis/.travis.tests-stage.yml (100%) diff --git a/.travis.yml b/.travis.yml index b21ccbc3f3..ca460ce2b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ import: - - source: .travis.env-vars.yml - - source: .travis.tests-stage.yml - - source: .travis.release-stage.yml - - source: .travis.publish-stage.yml + - source: travis/.travis.env-vars.yml + - source: travis/.travis.tests-stage.yml + - source: travis/.travis_integration_tests_MySQL.yml + - source: travis/.travis.release-stage.yml + - source: travis/.travis.publish-stage.yml dist: xenial sudo: required language: java diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh new file mode 100755 index 0000000000..f6ed525df9 --- /dev/null +++ b/scripts/mysql/common.sh @@ -0,0 +1,10 @@ +#!/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 \ No newline at end of file diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh new file mode 100644 index 0000000000..155572ff0e --- /dev/null +++ b/scripts/mysql/start.sh @@ -0,0 +1,43 @@ +#!/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" \ No newline at end of file diff --git a/.travis.env-vars.yml b/travis/.travis-env-vars.yml similarity index 100% rename from .travis.env-vars.yml rename to travis/.travis-env-vars.yml diff --git a/travis/.travis-integration-test-MySQL.yml b/travis/.travis-integration-test-MySQL.yml new file mode 100644 index 0000000000..9f20b1660b --- /dev/null +++ b/travis/.travis-integration-test-MySQL.yml @@ -0,0 +1,21 @@ +### Integration tests on MySQL are running: +## - on stable branch +## - on demand with commit message [execute tests on MySQL] + +jobs: + include: + - &integration_test_on_MYSQL + name: "Community Integrations Tests on MySQL" + 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 + 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 + + - <<: *integration_test_on_MYSQL + name: "Enterprise Integrations Tests on MySQL" + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 diff --git a/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml similarity index 100% rename from .travis.publish-stage.yml rename to travis/.travis.publish-stage.yml diff --git a/.travis.release-stage.yml b/travis/.travis.release-stage.yml similarity index 100% rename from .travis.release-stage.yml rename to travis/.travis.release-stage.yml diff --git a/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml similarity index 100% rename from .travis.tests-stage.yml rename to travis/.travis.tests-stage.yml From 5915d3811f820c544d7414ff55355b49b1170de9 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 15:35:30 +0200 Subject: [PATCH 28/40] fix travis import [execute tests on MySQL] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca460ce2b7..8870bd344d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis_integration_tests_MySQL.yml + - source: travis/.travis-integration-tests-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial From f7fc15ea0c95f4d82613ccd1cf2451029c398d58 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 16:16:47 +0200 Subject: [PATCH 29/40] fix typo[execute tests on MySQL] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8870bd344d..ca244ac488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis-integration-tests-MySQL.yml + - source: travis/.travis-integration-test-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial From 66e3c1626efb9374d2a3c43103fff9431e93e276 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 17:42:25 +0200 Subject: [PATCH 30/40] fix import of travis file [execute tests on MySQL] --- .travis.yml | 2 +- travis/{.travis-env-vars.yml => .travis.env-vars.yml} | 0 ...ration-test-MySQL.yml => .travis.integration-test-MySQL.yml} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename travis/{.travis-env-vars.yml => .travis.env-vars.yml} (100%) rename travis/{.travis-integration-test-MySQL.yml => .travis.integration-test-MySQL.yml} (100%) diff --git a/.travis.yml b/.travis.yml index ca244ac488..66c2efeba5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis-integration-test-MySQL.yml + - source: travis/.travis.integration-test-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial diff --git a/travis/.travis-env-vars.yml b/travis/.travis.env-vars.yml similarity index 100% rename from travis/.travis-env-vars.yml rename to travis/.travis.env-vars.yml diff --git a/travis/.travis-integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml similarity index 100% rename from travis/.travis-integration-test-MySQL.yml rename to travis/.travis.integration-test-MySQL.yml From 1d6f4c9ec6abf0b506cd107f5ebf6705412837ec Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 20:18:44 +0200 Subject: [PATCH 31/40] remo the stages that are duplicated [execute tests on MySQL] --- travis/.travis.tests-stage.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/travis/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml index 7a20d80d9a..8edc813953 100644 --- a/travis/.travis.tests-stage.yml +++ b/travis/.travis.tests-stage.yml @@ -1,14 +1,5 @@ jobs: include: - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" stage: Tests install: From a3f2532418414d9211a26e961ba9f58c9508fa93 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 09:00:46 +0200 Subject: [PATCH 32/40] Merge remote-tracking branch 'remotes/origin/release/V2.7' into feature-3.0/APPS-234_IntegrationTestsOnMySQL_no [execute tests on MySQL] # Conflicts: # .travis.env-vars.yml # .travis.yml # travis-env-vars.yml # travis/travis-env-vars.yml --- .travis.yml | 9 ++-- scripts/mysql/common.sh | 10 +++++ scripts/mysql/start.sh | 43 +++++++++++++++++++ .../.travis-env-vars.yml | 0 travis/.travis-integration-test-MySQL.yml | 21 +++++++++ .../.travis.publish-stage.yml | 0 .../.travis.release-stage.yml | 0 .../.travis.tests-stage.yml | 0 8 files changed, 79 insertions(+), 4 deletions(-) create mode 100755 scripts/mysql/common.sh create mode 100644 scripts/mysql/start.sh rename .travis.env-vars.yml => travis/.travis-env-vars.yml (100%) create mode 100644 travis/.travis-integration-test-MySQL.yml rename .travis.publish-stage.yml => travis/.travis.publish-stage.yml (100%) rename .travis.release-stage.yml => travis/.travis.release-stage.yml (100%) rename .travis.tests-stage.yml => travis/.travis.tests-stage.yml (100%) diff --git a/.travis.yml b/.travis.yml index 91b1a7704f..0535bcf841 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ import: - - source: .travis.env-vars.yml - - source: .travis.tests-stage.yml - - source: .travis.release-stage.yml - - source: .travis.publish-stage.yml + - source: travis/.travis.env-vars.yml + - source: travis/.travis.tests-stage.yml + - source: travis/.travis_integration_tests_MySQL.yml + - source: travis/.travis.release-stage.yml + - source: travis/.travis.publish-stage.yml dist: xenial sudo: required language: java diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh new file mode 100755 index 0000000000..f6ed525df9 --- /dev/null +++ b/scripts/mysql/common.sh @@ -0,0 +1,10 @@ +#!/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 \ No newline at end of file diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh new file mode 100644 index 0000000000..155572ff0e --- /dev/null +++ b/scripts/mysql/start.sh @@ -0,0 +1,43 @@ +#!/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" \ No newline at end of file diff --git a/.travis.env-vars.yml b/travis/.travis-env-vars.yml similarity index 100% rename from .travis.env-vars.yml rename to travis/.travis-env-vars.yml diff --git a/travis/.travis-integration-test-MySQL.yml b/travis/.travis-integration-test-MySQL.yml new file mode 100644 index 0000000000..9f20b1660b --- /dev/null +++ b/travis/.travis-integration-test-MySQL.yml @@ -0,0 +1,21 @@ +### Integration tests on MySQL are running: +## - on stable branch +## - on demand with commit message [execute tests on MySQL] + +jobs: + include: + - &integration_test_on_MYSQL + name: "Community Integrations Tests on MySQL" + 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 + 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 + + - <<: *integration_test_on_MYSQL + name: "Enterprise Integrations Tests on MySQL" + install: + - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 diff --git a/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml similarity index 100% rename from .travis.publish-stage.yml rename to travis/.travis.publish-stage.yml diff --git a/.travis.release-stage.yml b/travis/.travis.release-stage.yml similarity index 100% rename from .travis.release-stage.yml rename to travis/.travis.release-stage.yml diff --git a/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml similarity index 100% rename from .travis.tests-stage.yml rename to travis/.travis.tests-stage.yml From eef6a7fa76034fc6df03d60696c1126d4255d985 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 15:35:30 +0200 Subject: [PATCH 33/40] fix travis import [execute tests on MySQL] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0535bcf841..3eb352e4e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis_integration_tests_MySQL.yml + - source: travis/.travis-integration-tests-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial From 702d198ac0386bf036799a2f9f73f595d8e401d3 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 16:16:47 +0200 Subject: [PATCH 34/40] fix typo[execute tests on MySQL] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3eb352e4e8..36aa6949bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis-integration-tests-MySQL.yml + - source: travis/.travis-integration-test-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial From 91c3fe437b429a3ea2249f15331f00b4e6148037 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 17:42:25 +0200 Subject: [PATCH 35/40] fix import of travis file [execute tests on MySQL] --- .travis.yml | 2 +- travis/{.travis-env-vars.yml => .travis.env-vars.yml} | 0 ...ration-test-MySQL.yml => .travis.integration-test-MySQL.yml} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename travis/{.travis-env-vars.yml => .travis.env-vars.yml} (100%) rename travis/{.travis-integration-test-MySQL.yml => .travis.integration-test-MySQL.yml} (100%) diff --git a/.travis.yml b/.travis.yml index 36aa6949bb..ea33c47959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ import: - source: travis/.travis.env-vars.yml - source: travis/.travis.tests-stage.yml - - source: travis/.travis-integration-test-MySQL.yml + - source: travis/.travis.integration-test-MySQL.yml - source: travis/.travis.release-stage.yml - source: travis/.travis.publish-stage.yml dist: xenial diff --git a/travis/.travis-env-vars.yml b/travis/.travis.env-vars.yml similarity index 100% rename from travis/.travis-env-vars.yml rename to travis/.travis.env-vars.yml diff --git a/travis/.travis-integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml similarity index 100% rename from travis/.travis-integration-test-MySQL.yml rename to travis/.travis.integration-test-MySQL.yml From c108860caaac3f2c16e52f255a030e5c489a51aa Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 2 Nov 2020 20:18:44 +0200 Subject: [PATCH 36/40] remo the stages that are duplicated [execute tests on MySQL] --- travis/.travis.tests-stage.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/travis/.travis.tests-stage.yml b/travis/.travis.tests-stage.yml index 7a20d80d9a..8edc813953 100644 --- a/travis/.travis.tests-stage.yml +++ b/travis/.travis.tests-stage.yml @@ -1,14 +1,5 @@ jobs: include: - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" stage: Tests install: From aa0edd8525cf121b2fac9fc704b5809e9f7b3123 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Tue, 3 Nov 2020 08:59:49 +0200 Subject: [PATCH 37/40] add ActiveMQ [execute tests on MySQL] --- travis/.travis.integration-test-MySQL.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/travis/.travis.integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml index 9f20b1660b..ace98067f3 100644 --- a/travis/.travis.integration-test-MySQL.yml +++ b/travis/.travis.integration-test-MySQL.yml @@ -9,7 +9,9 @@ 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 + before_install: + - source ./scripts/mysql/start.sh mysql:5.7.23 + - docker run -d -p 61616:61616 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 From 1856a2ca78c07c2e8eb18248d3aa1830fbb2ce21 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 4 Nov 2020 08:22:15 +0200 Subject: [PATCH 38/40] revert the change of mysql version [execute tests on MySQL] --- travis/.travis.integration-test-MySQL.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/.travis.integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml index ace98067f3..d6b4dff914 100644 --- a/travis/.travis.integration-test-MySQL.yml +++ b/travis/.travis.integration-test-MySQL.yml @@ -10,7 +10,7 @@ jobs: stage: Tests if: branch =~ /(release\/.*$|master)/ OR commit_message =~ /\[execute tests on MySQL\]/ before_install: - - source ./scripts/mysql/start.sh mysql:5.7.23 + - source ./scripts/mysql/start.sh mysql:5.6.26 - docker run -d -p 61616:61616 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 From e38bc6a6ada683dbd7cd5b4e7e51a699ebfefb7a Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 4 Nov 2020 09:41:48 +0200 Subject: [PATCH 39/40] fix port issue for activemq [execute tests on MySQL] --- travis/.travis.integration-test-MySQL.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/.travis.integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml index d6b4dff914..acbdd3a307 100644 --- a/travis/.travis.integration-test-MySQL.yml +++ b/travis/.travis.integration-test-MySQL.yml @@ -11,7 +11,7 @@ jobs: if: branch =~ /(release\/.*$|master)/ OR commit_message =~ /\[execute tests on MySQL\]/ before_install: - source ./scripts/mysql/start.sh mysql:5.6.26 - - docker run -d -p 61616:61616 alfresco/alfresco-activemq:5.15.8 + - 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 From 513e93928a3a7babe2c73b634756011911c8fa84 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Wed, 4 Nov 2020 14:29:03 +0200 Subject: [PATCH 40/40] code review [execute tests on MySQL] --- travis/.travis.integration-test-MySQL.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/.travis.integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml index acbdd3a307..233c5eaeb7 100644 --- a/travis/.travis.integration-test-MySQL.yml +++ b/travis/.travis.integration-test-MySQL.yml @@ -18,6 +18,6 @@ jobs: - <<: *integration_test_on_MYSQL name: "Enterprise Integrations Tests on MySQL" install: - - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/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 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