Travis: update Linux docker versions and remove one build stage

5 years ago · bf3b70cedf
2 changed files with 30 additions and 155 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -38,11 +38,11 @@ jobs:
    ###
    # Stage: Build Carl
    ###
-    # ubuntu-19.10 - DefaultDebugTravis
+    # ubuntu-20.04 - DefaultDebugTravis
    - stage: Build Carl
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-20.04 COMPILER=gcc
      before_script:
        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
      script:
@ -53,11 +53,11 @@ jobs:
        - provider: script
          skip_cleanup: true
          script: bash travis/deploy_docker.sh carl
-    # ubuntu-19.10 - DefaultReleaseTravis
+    # ubuntu-20.04 - DefaultReleaseTravis
    - stage: Build Carl
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-20.04 COMPILER=gcc
      before_script:
        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
      script:
@ -168,11 +168,11 @@ jobs:
        - docker cp storm:/opt/storm/. .
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-19.10 - DefaultDebugTravis
+    # ubuntu-20.04 - DefaultDebugTravis
    - stage: Build (1st run)
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-20.04 COMPILER=gcc
      install:
        - rm -rf build
        - travis/skip_test.sh
@ -184,11 +184,11 @@ jobs:
        - docker cp storm:/opt/storm/. .
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-19.10 - DefaultReleaseTravis
+    # ubuntu-20.04 - DefaultReleaseTravis
    - stage: Build (1st run)
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-20.04 COMPILER=gcc
      install:
        - rm -rf build
        - travis/skip_test.sh
@ -294,11 +294,11 @@ jobs:
        - docker cp storm:/opt/storm/. .
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-19.10 - DefaultDebugTravis
+    # ubuntu-20.04 - DefaultDebugTravis
    - stage: Build (2nd run)
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-20.04 COMPILER=gcc
      install:
        - travis/skip_test.sh
      before_script:
@ -309,11 +309,11 @@ jobs:
        - docker cp storm:/opt/storm/. .
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-19.10 - DefaultReleaseTravis
+    # ubuntu-20.04 - DefaultReleaseTravis
    - stage: Build (2nd run)
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-20.04 COMPILER=gcc
      install:
        - travis/skip_test.sh
      before_script:
@ -330,130 +330,6 @@ jobs:
    ###
    # ubuntu-18.04 - DefaultDebug
    - stage: Build (3rd run)
-      os: linux
-      compiler: gcc
-      env: CONFIG=DefaultDebug TASK=Test LINUX=ubuntu-18.04 COMPILER=gcc
-      install:
-        - travis/skip_test.sh
-      before_script:
-        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
-      script:
-        - travis/build.sh Build3
-      before_cache:
-        - docker cp storm:/opt/storm/. .
-      after_failure:
-        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-18.04 - DefaultRelease
-    - stage: Build (3rd run)
-      os: linux
-      compiler: gcc
-      env: CONFIG=DefaultRelease TASK=Test LINUX=ubuntu-18.04 COMPILER=gcc
-      install:
-        - travis/skip_test.sh
-      before_script:
-        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
-      script:
-        - travis/build.sh Build3
-      before_cache:
-        - docker cp storm:/opt/storm/. .
-      after_failure:
-        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # debian-9 - DefaultDebug
-    - stage: Build (3rd run)
-      os: linux
-      compiler: gcc
-      env: CONFIG=DefaultDebug TASK=Test LINUX=debian-9 COMPILER=gcc
-      install:
-        - travis/skip_test.sh
-      before_script:
-        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
-      script:
-        - travis/build.sh Build3
-      before_cache:
-        - docker cp storm:/opt/storm/. .
-      after_failure:
-        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # debian-9 - DefaultRelease
-    - stage: Build (3rd run)
-      os: linux
-      compiler: gcc
-      env: CONFIG=DefaultRelease TASK=Test LINUX=debian-9 COMPILER=gcc
-      install:
-        - travis/skip_test.sh
-      before_script:
-        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
-      script:
-        - travis/build.sh Build3
-      before_cache:
-        - docker cp storm:/opt/storm/. .
-      after_failure:
-        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # debian-10 - DefaultDebug
-    - stage: Build (3rd run)
-      os: linux
-      compiler: gcc
-      env: CONFIG=DefaultDebug TASK=Test LINUX=debian-10 COMPILER=gcc
-      install:
-        - travis/skip_test.sh
-      before_script:
-        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
-      script:
-        - travis/build.sh Build3
-      before_cache:
-        - docker cp storm:/opt/storm/. .
-      after_failure:
-        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # debian-10 - DefaultRelease
-    - stage: Build (3rd run)
-      os: linux
-      compiler: gcc
-      env: CONFIG=DefaultRelease TASK=Test LINUX=debian-10 COMPILER=gcc
-      install:
-        - travis/skip_test.sh
-      before_script:
-        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
-      script:
-        - travis/build.sh Build3
-      before_cache:
-        - docker cp storm:/opt/storm/. .
-      after_failure:
-        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-19.10 - DefaultDebugTravis
-    - stage: Build (3rd run)
-      os: linux
-      compiler: gcc
-      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-19.10 COMPILER=gcc
-      install:
-        - travis/skip_test.sh
-      before_script:
-        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
-      script:
-        - travis/build.sh Build3
-      before_cache:
-        - docker cp storm:/opt/storm/. .
-      after_failure:
-        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-19.10 - DefaultReleaseTravis
-    - stage: Build (3rd run)
-      os: linux
-      compiler: gcc
-      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-19.10 COMPILER=gcc
-      install:
-        - travis/skip_test.sh
-      before_script:
-        - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # Workaround for nonblocking mode
-      script:
-        - travis/build.sh Build3
-      before_cache:
-        - docker cp storm:/opt/storm/. .
-      after_failure:
-        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-
-    ###
-    # Stage: Build (4th run)
-    ###
-    # ubuntu-18.04 - DefaultDebug
-    - stage: Build (4th run)
      os: linux
      compiler: gcc
      env: CONFIG=DefaultDebug TASK=Test LINUX=ubuntu-18.04 COMPILER=gcc
@ -468,7 +344,7 @@ jobs:
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
    # ubuntu-18.04 - DefaultRelease
-    - stage: Build (4th run)
+    - stage: Build (3rd run)
      os: linux
      compiler: gcc
      env: CONFIG=DefaultRelease TASK=Test LINUX=ubuntu-18.04 COMPILER=gcc
@ -483,7 +359,7 @@ jobs:
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
    # debian-9 - DefaultDebug
-    - stage: Build (4th run)
+    - stage: Build (3rd run)
      os: linux
      compiler: gcc
      env: CONFIG=DefaultDebug TASK=Test LINUX=debian-9 COMPILER=gcc
@ -498,7 +374,7 @@ jobs:
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
    # debian-9 - DefaultRelease
-    - stage: Build (4th run)
+    - stage: Build (3rd run)
      os: linux
      compiler: gcc
      env: CONFIG=DefaultRelease TASK=Test LINUX=debian-9 COMPILER=gcc
@ -513,7 +389,7 @@ jobs:
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
    # debian-10 - DefaultDebug
-    - stage: Build (4th run)
+    - stage: Build (3rd run)
      os: linux
      compiler: gcc
      env: CONFIG=DefaultDebug TASK=Test LINUX=debian-10 COMPILER=gcc
@ -528,7 +404,7 @@ jobs:
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
    # debian-10 - DefaultRelease
-    - stage: Build (4th run)
+    - stage: Build (3rd run)
      os: linux
      compiler: gcc
      env: CONFIG=DefaultRelease TASK=Test LINUX=debian-10 COMPILER=gcc
@ -542,11 +418,11 @@ jobs:
        - docker cp storm:/opt/storm/. .
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-19.10 - DefaultDebugTravis
-    - stage: Build (4th run)
+    # ubuntu-20.04 - DefaultDebugTravis
+    - stage: Build (3rd run)
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-20.04 COMPILER=gcc
      install:
        - travis/skip_test.sh
      before_script:
@ -557,11 +433,11 @@ jobs:
        - docker cp storm:/opt/storm/. .
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-19.10 - DefaultReleaseTravis
-    - stage: Build (4th run)
+    # ubuntu-20.04 - DefaultReleaseTravis
+    - stage: Build (3rd run)
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-20.04 COMPILER=gcc
      install:
        - travis/skip_test.sh
      before_script:
@ -666,11 +542,11 @@ jobs:
        - docker cp storm:/opt/storm/. .
      after_failure:
        - find build -iname '*err*.log' -type f -print -exec cat {} \;
-    # ubuntu-19.10 - DefaultDebugTravis
+    # ubuntu-20.04 - DefaultDebugTravis
    - stage: Tasks
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultDebugTravis TASK=TestDocker LINUX=ubuntu-20.04 COMPILER=gcc
      install:
        - travis/skip_test.sh
      before_script:
@ -685,11 +561,11 @@ jobs:
        - provider: script
          skip_cleanup: true
          script: bash travis/deploy_docker.sh storm
-    # ubuntu-19.10 - DefaultReleaseTravis
+    # ubuntu-20.04 - DefaultReleaseTravis
    - stage: Tasks
      os: linux
      compiler: gcc
-      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-19.10 COMPILER=gcc
+      env: CONFIG=DefaultReleaseTravis TASK=TestDockerDoxygen LINUX=ubuntu-20.04 COMPILER=gcc
      install:
        - travis/skip_test.sh
      before_script:
--- a/travis/generate_travis.py
+++ b/travis/generate_travis.py
@ -9,8 +9,8 @@ configs = [
    ("debian", "9", "gcc", "DefaultRelease", "Test"),
    ("debian", "10", "gcc", "DefaultDebug", "Test"),
    ("debian", "10", "gcc", "DefaultRelease", "Test"),
-    ("ubuntu", "19.10", "gcc", "DefaultDebugTravis", "TestDocker"),
-    ("ubuntu", "19.10", "gcc", "DefaultReleaseTravis", "TestDockerDoxygen"),
+    ("ubuntu", "20.04", "gcc", "DefaultDebugTravis", "TestDocker"),
+    ("ubuntu", "20.04", "gcc", "DefaultReleaseTravis", "TestDockerDoxygen"),
 #    ("osx", "xcode9.3", "clang", "DefaultDebug", "Test"),
 #    ("osx", "xcode9.3", "clang", "DefaultRelease", "Test"),
 ]
@ -19,8 +19,7 @@ configs = [
 build_stages = [
    ("Build (1st run)", "Build1"),
    ("Build (2nd run)", "Build2"),
-    ("Build (3rd run)", "Build3"),
-    ("Build (4th run)", "BuildLast"),
+    ("Build (3rd run)", "BuildLast"),
    ("Tasks", "Tasks"),
 ]