From bab780e6f94baa4050bd31fab87e59563eeb58a7 Mon Sep 17 00:00:00 2001
From: Andrii Nakryiko <andrii@kernel.org>
Date: Mon, 1 Feb 2021 21:01:22 -0800
Subject: [PATCH] travis-ci: update to Ubuntu Focal

Update to Ubuntu Focal 20.04.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
 .travis.yml                    | 12 ++++++------
 travis-ci/managers/debian.sh   | 12 ++++++++++++
 travis-ci/managers/ubuntu.sh   |  2 +-
 travis-ci/vmtest/run_vmtest.sh |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2ff7022..357d9d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 sudo: required
 language: bash
-dist: bionic
+dist: focal
 services:
     - docker
 
@@ -87,21 +87,21 @@ jobs:
           script:         $CI_ROOT/managers/debian.sh RUN_GCC10_ASAN || travis_terminate 1
           after_script:   $CI_ROOT/managers/debian.sh CLEANUP
 
-        - name: Ubuntu Bionic Build
+        - name: Ubuntu Focal Build
           language: bash
           script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
 
-        - name: Ubuntu Bionic Build (arm)
+        - name: Ubuntu Focal Build (arm)
           arch: arm64
           language: bash
           script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
 
-        - name: Ubuntu Bionic Build (s390x)
+        - name: Ubuntu Focal Build (s390x)
           arch: s390x
           language: bash
           script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
 
-        - name: Ubuntu Bionic Build (ppc64le)
+        - name: Ubuntu Focal Build (ppc64le)
           arch: ppc64le
           language: bash
           script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
@@ -120,7 +120,7 @@ jobs:
               - COVERITY_SCAN_BUILD_COMMAND_PREPEND="cd src/"
               - COVERITY_SCAN_BUILD_COMMAND="make"
           install:
-              - sudo echo 'deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse' >>/etc/apt/sources.list
+              - sudo echo 'deb-src http://archive.ubuntu.com/ubuntu/ focal 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/debian.sh b/travis-ci/managers/debian.sh
index 66fccbf..a10fc1d 100755
--- a/travis-ci/managers/debian.sh
+++ b/travis-ci/managers/debian.sh
@@ -31,6 +31,18 @@ for phase in "${PHASES[@]}"; do
             info "Setup phase"
             info "Using Debian $DEBIAN_RELEASE"
 
+	    # Install Docker Engine
+            sudo apt-get update
+            sudo apt-get install \
+                apt-transport-https \
+                ca-certificates \
+                curl \
+                gnupg-agent \
+                software-properties-common
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+            sudo add-apt-repository \
+                "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+            sudo apt-get update
             sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
             docker --version
 
diff --git a/travis-ci/managers/ubuntu.sh b/travis-ci/managers/ubuntu.sh
index e317488..2b00f65 100755
--- a/travis-ci/managers/ubuntu.sh
+++ b/travis-ci/managers/ubuntu.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux
 
-RELEASE="bionic"
+RELEASE="focal"
 
 echo "deb-src http://archive.ubuntu.com/ubuntu/ $RELEASE main restricted universe multiverse" >>/etc/apt/sources.list
 
diff --git a/travis-ci/vmtest/run_vmtest.sh b/travis-ci/vmtest/run_vmtest.sh
index 1db5cc0..b80585c 100755
--- a/travis-ci/vmtest/run_vmtest.sh
+++ b/travis-ci/vmtest/run_vmtest.sh
@@ -15,7 +15,7 @@ ${VMTEST_ROOT}/build_pahole.sh travis-ci/vmtest/pahole
 travis_fold start install_clang "Installing Clang/LLVM"
 
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main"
+sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main"
 sudo apt-get update
 sudo apt-get install -y clang-13 lld-13 llvm-13