From dd8f1bdd4565297d66d366a0c1c87f446ed91dff Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 14 Nov 2019 14:49:08 +0100
Subject: [PATCH] travis: bump the Ubuntu release to Bionic

The main reason why this is necessary is that gcc 5.x on Xenial doesn't
support ASan on s390x. Bumping the release to Bionic with gcc 7.x allows
us to build libbpf on s390x with ASan without issues.
---
 .travis.yml                                 | 16 ++++++++--------
 travis-ci/managers/{xenial.sh => ubuntu.sh} |  4 +++-
 2 files changed, 11 insertions(+), 9 deletions(-)
 rename travis-ci/managers/{xenial.sh => ubuntu.sh} (79%)

diff --git a/.travis.yml b/.travis.yml
index 40471b2..447e3d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: xenial
+dist: bionic
 services:
     - docker
 
@@ -124,27 +124,27 @@ jobs:
           after_script:
               - $CI_MANAGERS/debian.sh CLEANUP
 
-        - name: Ubuntu Xenial
+        - name: Ubuntu Bionic
           language: bash
           script:
               - set -e
-              - sudo $CI_MANAGERS/xenial.sh
+              - sudo $CI_MANAGERS/ubuntu.sh
               - set +e
 
-        - name: Ubuntu Xenial (arm)
+        - name: Ubuntu Bionic (arm)
           arch: arm64
           language: bash
           script:
               - set -e
-              - sudo $CI_MANAGERS/xenial.sh
+              - sudo $CI_MANAGERS/ubuntu.sh
               - set +e
 
-        - name: Ubuntu Xenial (s390x)
+        - name: Ubuntu Bionic (s390x)
           arch: s390x
           language: bash
           script:
               - set -e
-              - sudo $CI_MANAGERS/xenial.sh
+              - sudo $CI_MANAGERS/ubuntu.sh
               - set +e
 
         - stage: Coverity
@@ -161,7 +161,7 @@ jobs:
               - COVERITY_SCAN_BUILD_COMMAND_PREPEND="cd src/"
               - COVERITY_SCAN_BUILD_COMMAND="make"
           install:
-              - sudo echo 'deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse' >>/etc/apt/sources.list
+              - sudo echo 'deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse' >>/etc/apt/sources.list
               - sudo apt-get update
               - sudo apt-get -y build-dep libelf-dev
               - sudo apt-get install -y libelf-dev pkg-config
diff --git a/travis-ci/managers/xenial.sh b/travis-ci/managers/ubuntu.sh
similarity index 79%
rename from travis-ci/managers/xenial.sh
rename to travis-ci/managers/ubuntu.sh
index fabd5cc..3924d63 100755
--- a/travis-ci/managers/xenial.sh
+++ b/travis-ci/managers/ubuntu.sh
@@ -2,7 +2,9 @@
 set -e
 set -x
 
-echo 'deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse' >>/etc/apt/sources.list
+RELEASE="bionic"
+
+echo "deb-src http://archive.ubuntu.com/ubuntu/ $RELEASE main restricted universe multiverse" >>/etc/apt/sources.list
 
 apt-get update
 apt-get -y build-dep libelf-dev