remove xvfb memory workaround

This commit is contained in:
Claudia Agache
2020-10-21 10:32:04 +03:00
parent d3dea33999
commit 7bd8546d60
2 changed files with 50 additions and 50 deletions

View File

@@ -29,7 +29,7 @@ services:
- docker - docker
stages: stages:
- name: Build AGS # - name: Build AGS
- name: Tests - name: Tests
if: commit_message !~ /\[skip tests\]/ if: commit_message !~ /\[skip tests\]/
- name: Security Scans - name: Security Scans
@@ -38,54 +38,54 @@ stages:
jobs: jobs:
include: include:
- name: "Build AGS Community" # - name: "Build AGS Community"
stage: Build AGS # stage: Build AGS
before_script: source scripts/setUpMavenPhase.sh # before_script: source scripts/setUpMavenPhase.sh
script: # script:
- travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
#
- name: "Build AGS Enterprise" # - name: "Build AGS Enterprise"
stage: Build AGS # stage: Build AGS
before_script: source scripts/setUpMavenPhase.sh # before_script: source scripts/setUpMavenPhase.sh
install: # install:
- travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
script: # script:
- travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
#
- name: "Build AGS Benchmark" # - name: "Build AGS Benchmark"
stage: Build AGS # stage: Build AGS
before_script: source scripts/setUpMavenPhase.sh # before_script: source scripts/setUpMavenPhase.sh
install: # install:
- travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - travis_retry travis_wait 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
script: # script:
- travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
#
- name: "Community Integrations Tests on MySQL" # - name: "Community Integrations Tests on MySQL"
stage: Tests # stage: Tests
script: # script:
- echo "Community Integrations Tests on MySQL" # - echo "Community Integrations Tests on MySQL"
- name: "Enterprise Integrations Tests on MySQL" # - name: "Enterprise Integrations Tests on MySQL"
stage: Tests # stage: Tests
script: # script:
- 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: # before_install:
- travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q # - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q
- travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target # - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target
install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml # install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml
script: # script:
- travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
#
- name: "Enterprise Rest API Tests" # - name: "Enterprise Rest API Tests"
stage: Tests # stage: Tests
before_install: # before_install:
- travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q # - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q
- travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target # - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_ENTERPRISE_PATH/target
install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml # install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml
script: # script:
- travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_ENTERPRISE_PATH/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
- &community_shared_UI_config - &community_shared_UI_config
name: "Community Smoke UI Tests for Records" name: "Community Smoke UI Tests for Records"

View File

@@ -7,6 +7,6 @@ env:
- ALFRESCO_URL="http://localhost:8080/alfresco" - ALFRESCO_URL="http://localhost:8080/alfresco"
- SHARE_URL="http://localhost:8080/share" - SHARE_URL="http://localhost:8080/share"
- DISPLAY=:99.0 - DISPLAY=:99.0
- XVFB_ARGS="-screen 0 1920x1080x24 -noreset" - XVFB_ARGS="-screen 0 1920x1080x24"
- _JAVA_OPTIONS="-Xmx2048m -Xms1024m" - _JAVA_OPTIONS="-Xmx2048m -Xms1024m"
- WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30' - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30'