From e14d8cb8d015d018288aadb8d4ab97ab685222df Mon Sep 17 00:00:00 2001
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Wed, 15 Apr 2020 08:40:33 +0300
Subject: [PATCH] gitlab-ci: remove Ubuntu 19.04 Disco

Removed Ubuntu 19.04 Disco from testing which is EOL.

Close #4896
---
 .gitlab-ci.yml | 16 ++++++++--------
 .travis.yml    |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd710027ff83..843ba0918cc7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -323,17 +323,17 @@ ubuntu_18_04:
     OS: 'ubuntu'
     DIST: 'bionic'
 
-ubuntu_19_04:
+ubuntu_19_10:
   <<: *pack_definition
   variables:
     OS: 'ubuntu'
-    DIST: 'disco'
+    DIST: 'eoan'
 
-ubuntu_19_10:
+ubuntu_20_04:
   <<: *pack_definition
   variables:
     OS: 'ubuntu'
-    DIST: 'eoan'
+    DIST: 'focal'
 
 debian_8:
   <<: *pack_definition
@@ -415,17 +415,17 @@ ubuntu_18_04_deploy:
     OS: 'ubuntu'
     DIST: 'bionic'
 
-ubuntu_19_04_deploy:
+ubuntu_19_10_deploy:
   <<: *deploy_definition
   variables:
     OS: 'ubuntu'
-    DIST: 'disco'
+    DIST: 'eoan'
 
-ubuntu_19_10_deploy:
+ubuntu_20_04_deploy:
   <<: *deploy_definition
   variables:
     OS: 'ubuntu'
-    DIST: 'eoan'
+    DIST: 'focal'
 
 debian_8_deploy:
   <<: *deploy_definition
diff --git a/.travis.yml b/.travis.yml
index c63ab3ebd7ac..681027fe49ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,12 +67,12 @@ jobs:
       - name: "Ubuntu Bionic (18.04) build + deploy DEB"
         env: OS=ubuntu DIST=bionic
         if: branch = "master"
-      - name: "Ubuntu Disco (19.04) build + deploy DEB"
-        env: OS=ubuntu DIST=disco
-        if: branch = "master"
       - name: "Ubuntu Eoan (19.10) build + deploy DEB"
         env: OS=ubuntu DIST=eoan
         if: branch = "master"
+      - name: "Ubuntu Focal (20.04) build + deploy DEB"
+        env: OS=ubuntu DIST=focal
+        if: branch = "master"
       - name: "Debian Jessie (8) build + deploy DEB"
         env: OS=debian DIST=jessie
         if: branch = "master"