inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/feature/APPS-460_ACForLegalHoldFlag_no' into feature/APPS-467_AutomateAC

Browse Source 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/wormLock/aspect/WormLockAspect.java
This commit is contained in:
rodicasutu
2020-09-07 08:49:18 +03:00
parent 71a2f57f5c 6aeac1f63f
commit 47e89a85fe
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -107,7 +107,7 @@ jobs:
- bash scripts/create-worm-bucket.sh - bash scripts/create-worm-bucket.sh
- bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/docker-compose-worm-support-rest.yml" - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/docker-compose-worm-support-rest.yml"
- bash scripts/waitForAlfrescoToStart.sh - bash scripts/waitForAlfrescoToStart.sh
script: mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false script: mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Ds3.accessKey=${AWS_ACCESS_KEY_ID} -Ds3.secretKey=${AWS_SECRET_ACCESS_KEY} -Ds3.bucketName=${S3_BUCKET2_NAME} -Ds3.bucketRegion=${S3_BUCKET_REGION}
after_script: bash scripts/cleanup.sh after_script: bash scripts/cleanup.sh
after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000

4
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
View File

@@ -533,7 +533,7 @@ public class BaseRMRestTest extends RestTest
* @return the created record * @return the created record
* @throws Exception * @throws Exception
*/ */
public Record createElectronicRecord(String parentId, String name) throws Exception public Record createElectronicRecord(String parentId, String name)
{ {
return createElectronicRecord(parentId, name ,null); return createElectronicRecord(parentId, name ,null);
} }
@@ -547,7 +547,7 @@ public class BaseRMRestTest extends RestTest
* @return the created record * @return the created record
* @throws Exception * @throws Exception
*/ */
public Record createElectronicRecord(String parentId, String name, UserModel user) throws Exception public Record createElectronicRecord(String parentId, String name, UserModel user)
{ {
RecordFolderAPI recordFolderAPI = restAPIFactory.getRecordFolderAPI(user); RecordFolderAPI recordFolderAPI = restAPIFactory.getRecordFolderAPI(user);
Record recordModel = Record.builder().name(name).nodeType(CONTENT_TYPE).build(); Record recordModel = Record.builder().name(name).nodeType(CONTENT_TYPE).build();