From 6f959c46d1fb9539ed0a3b602f65e5878d74bb62 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 13 Nov 2020 10:02:45 +0200 Subject: [PATCH 1/6] attemp to figure out what is wrong with enterprise integration tests [execute tests on MySQL] --- travis/.travis.integration-test-MySQL.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/travis/.travis.integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml index 233c5eaeb7..e001d856b7 100644 --- a/travis/.travis.integration-test-MySQL.yml +++ b/travis/.travis.integration-test-MySQL.yml @@ -10,14 +10,13 @@ jobs: stage: Tests if: branch =~ /(release\/.*$|master)/ OR commit_message =~ /\[execute tests on MySQL\]/ before_install: - - source ./scripts/mysql/start.sh mysql:5.6.26 + - source ./scripts/mysql/start.sh mysql:5.7.23 - 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=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 ${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 + 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 d3275fae644ee4648805e6d114e03d42fa13da8b Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 13 Nov 2020 11:51:19 +0200 Subject: [PATCH 2/6] change MySQL version and how it starts [execute tests on MySQL] --- travis/.travis.integration-test-MySQL.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/travis/.travis.integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml index e001d856b7..b4a144350b 100644 --- a/travis/.travis.integration-test-MySQL.yml +++ b/travis/.travis.integration-test-MySQL.yml @@ -10,13 +10,13 @@ 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 + - 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 + script: travis_retry travis_wait 80 mvn -B -q clean install -Puse-mysql -DskipTests -Dskip.integrationtests=false -Dmy.db.name=alfresco -Dmy.db.port=3307 -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn From 55a7825bca55bc899e3b939fd9974be44d68af6d Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 13 Nov 2020 14:34:56 +0200 Subject: [PATCH 3/6] attempt to fix unauthorized when getting dependencies issue [execute tests on MySQL] --- travis/.travis.integration-test-MySQL.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/.travis.integration-test-MySQL.yml b/travis/.travis.integration-test-MySQL.yml index b4a144350b..508c4ed158 100644 --- a/travis/.travis.integration-test-MySQL.yml +++ b/travis/.travis.integration-test-MySQL.yml @@ -18,5 +18,5 @@ jobs: - <<: *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=3307 -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 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn From a744802a34c261fa93166eda1f89ce513404f9fe Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 13 Nov 2020 16:22:16 +0200 Subject: [PATCH 4/6] attempt (2) to fix unauthorized when getting dependencies issue [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 508c4ed158..ebd7579264 100644 --- a/travis/.travis.integration-test-MySQL.yml +++ b/travis/.travis.integration-test-MySQL.yml @@ -19,4 +19,4 @@ jobs: 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 -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 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + 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 From 838d9646949c17a0dfc2f54eef575a355940b599 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Fri, 13 Nov 2020 17:24:20 +0200 Subject: [PATCH 5/6] attempt (3) to fix unauthorized when getting dependencies issue [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 ebd7579264..05934be796 100644 --- a/travis/.travis.integration-test-MySQL.yml +++ b/travis/.travis.integration-test-MySQL.yml @@ -9,7 +9,7 @@ jobs: services: docker stage: Tests if: branch =~ /(release\/.*$|master)/ OR commit_message =~ /\[execute tests on MySQL\]/ - before_install: + 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: From 27b20f06b17a5750008fa9baf877b4e016957f95 Mon Sep 17 00:00:00 2001 From: rodicasutu Date: Mon, 16 Nov 2020 08:27:11 +0200 Subject: [PATCH 6/6] remove the scripts for MySQL [execute tests on MySQL] --- scripts/mysql/common.sh | 10 ---------- scripts/mysql/start.sh | 43 ----------------------------------------- 2 files changed, 53 deletions(-) delete mode 100755 scripts/mysql/common.sh delete mode 100644 scripts/mysql/start.sh diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh deleted file mode 100755 index f6ed525df9..0000000000 --- a/scripts/mysql/common.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh deleted file mode 100644 index 155572ff0e..0000000000 --- a/scripts/mysql/start.sh +++ /dev/null @@ -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" \ No newline at end of file