From 07e0794a78a73128bf7174059142d9f85e06319c Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sun, 2 Aug 2020 09:27:51 +0100 Subject: [PATCH] Add TAS and SKIP_DB build switches --- .travis.yml | 11 +++++++++++ pom.xml | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3b3c85f42c..72168f82cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -126,24 +126,28 @@ jobs: script: travis_wait 20 mvn test -B -pl repository -Dtest=MiscContextTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dalfresco-pdf-renderer.url=http://localhost:8090/ -Djodconverter.url=http://localhost:8090/ -Dimg.url=http://localhost:8090/ -Dtika.url=http://localhost:8090/ -Dtransform.misc.url=http://localhost:8090/ - name: "Repository - MySQL tests" + if: commit_message !~ /\[skip_db\]/ 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 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 script: travis_wait 20 mvn test -B -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - name: "Repository - PostgreSQL 10 tests" + if: commit_message !~ /\[skip_db\]/ install: - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.9 postgres -c 'max_connections=300' - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 script: travis_wait 20 mvn test -B -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - name: "Repository - PostgreSQL 11 tests" + if: commit_message !~ /\[skip_db\]/ install: - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300' - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 script: travis_wait 20 mvn test -B -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - name: "Repository - MariaDB tests" + if: commit_message !~ /\[skip_db\]/ install: - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.2.18 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.15.8 @@ -181,6 +185,7 @@ jobs: - name: "REST API TAS tests part1" jdk: openjdk11 + if: commit_message ~ /\[tas\]/ install: - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" @@ -189,6 +194,7 @@ jobs: - name: "REST API TAS tests part2" jdk: openjdk11 + if: commit_message ~ /\[tas\]/ install: - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" @@ -197,6 +203,7 @@ jobs: - name: "REST API TAS tests part3" jdk: openjdk11 + if: commit_message ~ /\[tas\]/ install: - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" @@ -205,6 +212,7 @@ jobs: - name: "CMIS TAS tests" jdk: openjdk11 + if: commit_message ~ /\[tas\]/ install: - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" @@ -213,6 +221,7 @@ jobs: - name: "Email TAS tests" jdk: openjdk11 + if: commit_message ~ /\[tas\]/ install: - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" @@ -221,6 +230,7 @@ jobs: - name: "WebDAV TAS tests" jdk: openjdk11 + if: commit_message ~ /\[tas\]/ install: - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" @@ -229,6 +239,7 @@ jobs: - name: "Integration TAS tests" jdk: openjdk11 + if: commit_message ~ /\[tas\]/ install: - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" diff --git a/pom.xml b/pom.xml index ffc4159a55..444de32b04 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,12 @@ + + org.alfresco + content-services-community + ${dependency.alfresco-community-repo.version} + war + org.alfresco alfresco-core