inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,657 Commits 330 Branches 2,178 Tags
270f795f1411b9fb645ad5b13f1ec23fcfa6b57c
Commit Graph

7657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claudia Agache
f2767f164a increase docker memory 2020-10-07 14:39:56 +03:00
Claudia Agache
a218d4b135 increase docker memory 2020-10-07 11:29:16 +03:00
Claudia Agache
826177b758 Revert using arch arm64-graviton2 2020-10-07 10:50:17 +03:00
Claudia Agache
041b2de72c Route to a 'full VM' instance in AWS over Gravitation2 CPU 2020-10-07 10:05:18 +03:00
Claudia Agache
181cf91a6f Try to use AWS env 2020-10-07 09:48:59 +03:00
Claudia Agache
c298893ce6 Revert "Created a light docker compose file in order to not get "No output has been received in the last 10m0s" in travis when executing tests" 
This reverts commit 36ed6e0b
 2020-10-07 09:45:35 +03:00
Claudia Agache
36ed6e0b86 Created a light docker compose file in order to not get "No output has been received in the last 10m0s" in travis when executing tests 2020-10-07 08:54:47 +03:00
ehardon
17d00af5e2 APPS-241 - Add script for extracting the Release Version, Development Version, Release Type and the right S3 locations for the artefacts 2020-10-06 14:20:17 +03:00
Claudia Agache
2af6029203 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/APPS-237_RunERTests_no 
# Conflicts:
#	.travis.yml
 2020-10-05 20:28:26 +03:00
Claudia Agache
d5c9ab863b Record only merge 2020-10-05 20:23:06 +03:00
Claudia Agache
6ebc855590 Record only merge 2020-10-05 20:23:00 +03:00
Claudia Agache
fd98a1c066 Record only merge 2020-10-05 20:22:54 +03:00
Claudia Agache
a40d648738 Merge pull request #1243 from Alfresco/merge-3.0/APPS-237_RunERTests_no 
Merge 3.0/apps 237 run er tests no
 2020-10-05 09:19:24 +03:00
Claudia Agache
b13b6f5e93 Merge pull request #1243 from Alfresco/merge-3.0/APPS-237_RunERTests_no 
Merge 3.0/apps 237 run er tests no
# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/resources/log4j.properties
 2020-10-05 09:18:56 +03:00
Claudia Agache
392f70be18 Merge pull request #1243 from Alfresco/merge-3.0/APPS-237_RunERTests_no 
Merge 3.0/apps 237 run er tests no
# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/resources/log4j.properties
 2020-10-05 09:17:39 +03:00
Claudia Agache
7cc5f2993b Merge pull request #1243 from Alfresco/merge-3.0/APPS-237_RunERTests_no 
Merge 3.0/apps 237 run er tests no
 2020-10-05 09:01:18 +03:00
Claudia Agache
732f747021 corrected stage phases 2020-10-02 15:39:15 +03:00
ehardon
e918491140 APPS-241 - create Community Release for v2.7 2020-10-02 13:48:37 +03:00
Claudia Agache
3b998744dd Execute enterprise rest api tests 2020-10-02 12:11:36 +03:00
Claudia Agache
356164d348 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/APPS-237_RunERTests_no 
# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/resources/log4j.properties
 2020-10-02 12:06:47 +03:00
Claudia Agache
cd175f66e0 Record only merge 2020-10-02 12:00:47 +03:00
Claudia Agache
b022ea8e52 Merge pull request #1241 from Alfresco/merge-2.7/APPS-237_RunERTests_2.7.0.x_no 
Merge 2.7/apps 237 run er tests 2.7.0.x no
 2020-10-02 11:58:08 +03:00
Claudia Agache
a8a4326d03 Record only merge. 2020-10-02 07:43:27 +03:00
Claudia Agache
4fec152ff0 Merge remote-tracking branch 'remotes/origin/release/V2.7.2.x' into release/V2.7 2020-10-02 07:42:22 +03:00
Claudia Agache
2c43416776 use enterprise installer 5.2.3 for enterprise rest api tests 2020-10-02 07:29:15 +03:00
Claudia Agache
5f66cd900e small fix 2020-10-01 15:42:07 +03:00
Tom Page
1c69f50c40 Merge release/V3.3 into release/V3.4. 2020-10-01 11:17:02 +01:00
Tom Page
b4160fb824 Merge release/V3.2 into release/V3.3. 2020-10-01 11:16:28 +01:00
Tom Page
3f4069630e Revert "Merge pull request #1217 from Alfresco/hotfix-3.2/MNT-21818" 
This reverts commit 213e3a3889, reversing
changes made to cebafd890d.
 2020-10-01 11:14:37 +01:00
Claudia Agache
b2a466ecc2 use enterprise installer 5.2.7.4 for enterprise rest api tests 2020-10-01 12:57:00 +03:00
Tom Page
71d2abcb30 Merge release/V3.3 into release/V3.4. 2020-10-01 09:13:31 +01:00
Tom Page
9b6e084b44 Merge release/V3.2 into release/V3.3. 2020-10-01 09:11:48 +01:00
Tom Page
2921b3190e Revert "Merge pull request #1220 from Alfresco/hotfix-3.2/MNT-21818_fix_tests" 
This reverts commit e75022a6f1, reversing
changes made to 213e3a3889.
 2020-10-01 09:08:13 +01:00
Claudia Agache
e65c5e394d Merge pull request #1238 from Alfresco/feature-2.7/APPS-237_RunERTests_no 
APPS-237 Execute enterprise rest api tests in travis
 2020-10-01 09:37:10 +03:00
Claudia Agache
94c3d3c3b7 APPS-237 Execute enterprise rest api tests in travis 2020-10-01 08:31:10 +03:00
Claudia Agache
46694bd355 APPS-237 Execute enterprise rest api tests in travis 2020-10-01 08:30:16 +03:00
Claudia Agache
1e11443440 APPS-237 Execute enterprise rest api tests in travis 2020-10-01 08:05:32 +03:00
Claudia Agache
54d3e5c1e8 Record only merge 2020-09-30 17:28:32 +03:00
Claudia Agache
83d1666393 APPS-237 Execute enterprise rest api tests in travis 2020-09-30 15:15:11 +03:00
Claudia Agache
afb75558c5 Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge-3.4/APPS-236_and_APPS-488_no 
# Conflicts:
#	.travis.yml
 2020-09-30 15:07:46 +03:00
Claudia Agache
f09771b374 Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge-3.4/APPS-236_and_APPS-488_no 
# Conflicts:
#	.travis.yml
 2020-09-30 15:04:57 +03:00
Claudia Agache
25954dea39 Record only merge 2020-09-30 14:59:15 +03:00
Claudia Agache
63e2da4bbb Record only merge 2020-09-30 14:59:09 +03:00
Claudia Agache
b44a2c0fb3 Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/APPS-236_and_APPS-488_no 2020-09-30 11:42:31 +03:00
Claudia Agache
ff2d5e7120 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
 2020-09-30 11:38:57 +03:00
Claudia Agache
81b2539166 Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/APPS-236_and_APPS-488_no 2020-09-30 11:34:36 +03:00
Claudia Agache
0c8d0679d1 Record only merge 2020-09-30 11:31:01 +03:00
Ramona Popa
4f376fac64 Merge branch 'feature/mergeto33_RM-7099' into 'release/V3.3' 
Merge branch 'feature/RM-7099_UpdateOrIgnoreQuarantinedTests' into 'master'

See merge request records-management/records-management!1355

(cherry picked from commit ae77c261d5)
 2020-09-30 10:21:17 +03:00
Claudia Agache
ffa8053444 Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/APPS-236_and_APPS-488_no 2020-09-30 09:02:18 +03:00
Claudia Agache
9c9a2c0413 Record only merge 2020-09-30 09:01:21 +03:00