RM-4347 (Integrate rm-rest-api-automation in rm-ui-automation)

This commit is contained in:
Tuna Aksoy
2016-11-13 19:05:34 +00:00
parent a7996cf7fd
commit cde04c5d78
2 changed files with 6 additions and 4 deletions

View File

@@ -127,13 +127,13 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-enterprise-share</artifactId> <artifactId>${alfresco.rm.share}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>amp</type> <type>amp</type>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-enterprise-repo</artifactId> <artifactId>${alfresco.rm.repo}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>amp</type> <type>amp</type>
</artifactItem> </artifactItem>
@@ -157,7 +157,7 @@
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<configuration> <configuration>
<backup>true</backup> <backup>true</backup>
<ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp</ampLocation> <ampLocation>${project.build.directory}/amps/${alfresco.rm.repo}-${project.version}.amp</ampLocation>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation> <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
</configuration> </configuration>
</execution> </execution>
@@ -169,7 +169,7 @@
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<configuration> <configuration>
<backup>true</backup> <backup>true</backup>
<ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp</ampLocation> <ampLocation>${project.build.directory}/amps/${alfresco.rm.share}-${project.version}.amp</ampLocation>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation> <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
</configuration> </configuration>
</execution> </execution>

View File

@@ -16,6 +16,8 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<suiteXmlFile>testng.xml</suiteXmlFile> <suiteXmlFile>testng.xml</suiteXmlFile>
<skip.automationtests>true</skip.automationtests> <skip.automationtests>true</skip.automationtests>
<alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
<alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
</properties> </properties>
<dependencies> <dependencies>