remove xvfb memory workaround

2025-07-31 17:39:05 +00:00 · 2020-10-21 10:32:04 +03:00
parent d3dea33999
commit 7bd8546d60
2 changed files with 50 additions and 50 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ services:
  - docker

 stages:
-  - name: Build AGS
+#  - name: Build AGS
  - name: Tests
    if: commit_message !~ /\[skip tests\]/
  - name: Security Scans
@@ -38,54 +38,54 @@ stages:

 jobs:
  include:
-    - name: "Build AGS Community"
-      stage: Build AGS
-      before_script: source scripts/setUpMavenPhase.sh
-      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
-
-    - name: "Build AGS Enterprise"
-      stage: Build AGS
-      before_script: source scripts/setUpMavenPhase.sh
-      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
-      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
-
-    - name: "Build AGS Benchmark"
-      stage: Build AGS
-      before_script: source scripts/setUpMavenPhase.sh
-      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
-      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
-
-    - name: "Community Integrations Tests on MySQL"
-      stage: Tests
-      script:
-        - echo "Community Integrations Tests on MySQL"
-    - name: "Enterprise Integrations Tests on MySQL"
-      stage: Tests
-      script:
-        - echo "Enterprise Integrations Tests on MySQL"
-
-    - name: "Community Rest API Tests"
-      stage: Tests
-      before_install:
-        - 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
-      install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml
-      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
-
-    - name: "Enterprise Rest API Tests"
-      stage: Tests
-      before_install:
-        - 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
-      install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml
-      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
+#    - name: "Build AGS Community"
+#      stage: Build AGS
+#      before_script: source scripts/setUpMavenPhase.sh
+#      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
+#
+#    - name: "Build AGS Enterprise"
+#      stage: Build AGS
+#      before_script: source scripts/setUpMavenPhase.sh
+#      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
+#      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
+#
+#    - name: "Build AGS Benchmark"
+#      stage: Build AGS
+#      before_script: source scripts/setUpMavenPhase.sh
+#      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
+#      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
+#
+#    - name: "Community Integrations Tests on MySQL"
+#      stage: Tests
+#      script:
+#        - echo "Community Integrations Tests on MySQL"
+#    - name: "Enterprise Integrations Tests on MySQL"
+#      stage: Tests
+#      script:
+#        - echo "Enterprise Integrations Tests on MySQL"
+#
+#    - name: "Community Rest API Tests"
+#      stage: Tests
+#      before_install:
+#        - 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
+#      install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml
+#      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
+#
+#    - name: "Enterprise Rest API Tests"
+#      stage: Tests
+#      before_install:
+#        - 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
+#      install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_ENTERPRISE_PATH/pom.xml
+#      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

    - &community_shared_UI_config
      name: "Community Smoke UI Tests for Records"
--- a/travis-env-vars.yml
+++ b/travis-env-vars.yml
@@ -7,6 +7,6 @@ env:
    - ALFRESCO_URL="http://localhost:8080/alfresco"
    - SHARE_URL="http://localhost:8080/share"
    - DISPLAY=:99.0
-    - XVFB_ARGS="-screen 0 1920x1080x24 -noreset"
+    - XVFB_ARGS="-screen 0 1920x1080x24"
    - _JAVA_OPTIONS="-Xmx2048m -Xms1024m"
    - WEBDRIVER_ARGUMENTS='-Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dorg.alfresco.rm.timeout_seconds.MEDIUM=30'