some refactoring [execute tests on MySQL]

.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:

scripts/my_sql_travis.sql

@@ -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;

scripts/mysql/common.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -xe
+set -e
 CONTAINER_NAME=alfresco-db-mysql
 
 MYSQL_USER=alfresco

scripts/mysql/start.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
-set -xe
+set -e
-DIRECTORY=`dirname $0`
+
-echo $DIRECTORY
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 
 echo "============================================"

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