mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/APPS-236_and_APPS-488_no
# Conflicts: # rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/SearchRecordsV1CmisTests.java
This commit is contained in:
Claudia Agache
21
.travis.yml
21
.travis.yml
@@ -71,13 +71,24 @@ jobs:
|
|||||||
- echo "Enterprise Integrations Tests on MySQL"
|
- echo "Enterprise Integrations Tests on MySQL"
|
||||||
- name: "Community Rest API Tests"
|
- name: "Community Rest API Tests"
|
||||||
stage: Tests
|
stage: Tests
|
||||||
before_install:
|
|
||||||
- travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am
|
|
||||||
install:
|
install:
|
||||||
- bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH
|
- |
|
||||||
|
if [[ ${TRAVIS_BRANCH} == *community* ]]; then
|
||||||
|
travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am
|
||||||
|
else
|
||||||
|
travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am
|
||||||
|
fi
|
||||||
|
- travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-community-rest-api -am
|
||||||
|
before_script:
|
||||||
|
- |
|
||||||
|
if [[ ${TRAVIS_BRANCH} == *community* ]]; then
|
||||||
|
bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH
|
||||||
|
else
|
||||||
|
bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH
|
||||||
|
fi
|
||||||
- bash scripts/waitForAlfrescoToStart.sh
|
- bash scripts/waitForAlfrescoToStart.sh
|
||||||
script:
|
script: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false
|
||||||
- echo "Community Rest API Tests"
|
after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000
|
||||||
- name: "Enterprise Rest API Tests"
|
- name: "Enterprise Rest API Tests"
|
||||||
stage: Tests
|
stage: Tests
|
||||||
before_install:
|
before_install:
|
||||||
|
|||||||
@@ -86,251 +86,4 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>install-alfresco</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>fetch-installer</id>
|
|
||||||
<phase>generate-test-resources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<target>
|
|
||||||
<echo>Recreating database...</echo>
|
|
||||||
<sql driver="org.postgresql.Driver" url="jdbc:postgresql:template1" userid="alfresco" password="alfresco" autocommit="true">drop database if exists alfresco; create database alfresco</sql>
|
|
||||||
<echo>Downloading Alfresco installer...</echo>
|
|
||||||
<get src="${installer.url}" dest="target/alf-installer.bin" />
|
|
||||||
<chmod file="target/alf-installer.bin" perm="a+x" verbose="true" />
|
|
||||||
<echo>Installing Alfresco...</echo>
|
|
||||||
<exec executable="${basedir}/target/alf-installer.bin" dir="target" failonerror="true">
|
|
||||||
<arg line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation" />
|
|
||||||
</exec>
|
|
||||||
<delete file="target/alf-installer.bin" verbose="true" />
|
|
||||||
</target>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>postgresql</groupId>
|
|
||||||
<artifactId>postgresql</artifactId>
|
|
||||||
<version>9.1-901-1.jdbc4</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>apply-ags-community</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>fetch-amps</id>
|
|
||||||
<phase>process-test-resources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>copy</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<artifactItems>
|
|
||||||
<artifactItem>
|
|
||||||
<groupId>org.alfresco</groupId>
|
|
||||||
<artifactId>alfresco-governance-services-community-share</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
<type>amp</type>
|
|
||||||
</artifactItem>
|
|
||||||
<artifactItem>
|
|
||||||
<groupId>org.alfresco</groupId>
|
|
||||||
<artifactId>alfresco-governance-services-community-repo</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
<type>amp</type>
|
|
||||||
</artifactItem>
|
|
||||||
</artifactItems>
|
|
||||||
<outputDirectory>${project.build.directory}/amps</outputDirectory>
|
|
||||||
<useBaseVersion>true</useBaseVersion>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.alfresco.maven.plugin</groupId>
|
|
||||||
<artifactId>alfresco-maven-plugin</artifactId>
|
|
||||||
<extensions>true</extensions>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>install-community-repo-amp</id>
|
|
||||||
<goals>
|
|
||||||
<goal>install</goal>
|
|
||||||
</goals>
|
|
||||||
<phase>process-test-resources</phase>
|
|
||||||
<configuration>
|
|
||||||
<backup>true</backup>
|
|
||||||
<ampLocation>
|
|
||||||
${project.build.directory}/amps/alfresco-governance-services-community-repo-${project.version}.amp
|
|
||||||
</ampLocation>
|
|
||||||
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war
|
|
||||||
</warLocation>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>install-community-share-amp</id>
|
|
||||||
<goals>
|
|
||||||
<goal>install</goal>
|
|
||||||
</goals>
|
|
||||||
<phase>process-test-resources</phase>
|
|
||||||
<configuration>
|
|
||||||
<backup>true</backup>
|
|
||||||
<ampLocation>
|
|
||||||
${project.build.directory}/amps/alfresco-governance-services-community-share-${project.version}.amp
|
|
||||||
</ampLocation>
|
|
||||||
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war
|
|
||||||
</warLocation>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>apply-ags-enterprise</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>fetch-amps</id>
|
|
||||||
<phase>process-test-resources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>copy</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<artifactItems>
|
|
||||||
<artifactItem>
|
|
||||||
<groupId>org.alfresco</groupId>
|
|
||||||
<artifactId>${ags.share}</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
<type>amp</type>
|
|
||||||
</artifactItem>
|
|
||||||
<artifactItem>
|
|
||||||
<groupId>org.alfresco</groupId>
|
|
||||||
<artifactId>${ags.repo}</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
<type>amp</type>
|
|
||||||
</artifactItem>
|
|
||||||
</artifactItems>
|
|
||||||
<outputDirectory>${project.build.directory}/amps</outputDirectory>
|
|
||||||
<useBaseVersion>true</useBaseVersion>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.alfresco.maven.plugin</groupId>
|
|
||||||
<artifactId>alfresco-maven-plugin</artifactId>
|
|
||||||
<extensions>true</extensions>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>install-enterprise-repo-amp</id>
|
|
||||||
<goals>
|
|
||||||
<goal>install</goal>
|
|
||||||
</goals>
|
|
||||||
<phase>process-test-resources</phase>
|
|
||||||
<configuration>
|
|
||||||
<backup>true</backup>
|
|
||||||
<ampLocation>${project.build.directory}/amps/${ags.repo}-${project.version}.amp</ampLocation>
|
|
||||||
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>install-enterprise-share-amp</id>
|
|
||||||
<goals>
|
|
||||||
<goal>install</goal>
|
|
||||||
</goals>
|
|
||||||
<phase>process-test-resources</phase>
|
|
||||||
<configuration>
|
|
||||||
<backup>true</backup>
|
|
||||||
<ampLocation>${project.build.directory}/amps/${ags.share}-${project.version}.amp</ampLocation>
|
|
||||||
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>run-alfresco</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.jacoco</groupId>
|
|
||||||
<artifactId>jacoco-maven-plugin</artifactId>
|
|
||||||
<version>0.7.5.201505241946</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>prepare-jacoco</id>
|
|
||||||
<goals>
|
|
||||||
<goal>prepare-agent</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<configuration>
|
|
||||||
<includes>
|
|
||||||
<include>org.alfresco.*</include>
|
|
||||||
</includes>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>start-alfresco</id>
|
|
||||||
<phase>process-test-classes</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<target>
|
|
||||||
<echo>Starting Alfresco...</echo>
|
|
||||||
<exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
|
|
||||||
<arg value="start" />
|
|
||||||
<env key="CATALINA_OPTS" value="${argLine}" />
|
|
||||||
</exec>
|
|
||||||
<sleep minutes="5" />
|
|
||||||
</target>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>stop-alfresco</id>
|
|
||||||
<phase>post-integration-test</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<target>
|
|
||||||
<echo>Stopping Alfresco...</echo>
|
|
||||||
<exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
|
|
||||||
<arg value="stop" />
|
|
||||||
</exec>
|
|
||||||
</target>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
log4j.rootLogger=info, console
|
# Root logger option
|
||||||
|
log4j.rootLogger=INFO, file
|
||||||
|
|
||||||
log4j.appender.console=org.apache.log4j.ConsoleAppender
|
# Direct log messages to a log file
|
||||||
log4j.appender.console.layout=org.apache.log4j.PatternLayout
|
log4j.appender.file=org.apache.log4j.RollingFileAppender
|
||||||
log4j.appender.console.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
|
log4j.appender.file.File=./target/reports/rm-automation-community-rest-api.log
|
||||||
|
log4j.appender.file.MaxBackupIndex=10
|
||||||
|
log4j.appender.file.layout=org.apache.log4j.PatternLayout
|
||||||
|
log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
|
||||||
|
|
||||||
log4j.logger.com.example=debug
|
log4j.logger.com.example=debug
|
||||||
@@ -141,6 +141,7 @@
|
|||||||
<phase>integration-test</phase>
|
<phase>integration-test</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>integration-test</goal>
|
<goal>integration-test</goal>
|
||||||
|
<goal>verify</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
|
|||||||
Reference in New Issue
Block a user