From 9e123fa5d20017923ec39b5af5f269488b7073d6 Mon Sep 17 00:00:00 2001
From: Andrii Nakryiko <andrii@kernel.org>
Date: Thu, 29 Apr 2021 12:57:54 -0700
Subject: [PATCH] vmtests: fix libc6 dependency and remove explicit libelf-dev
 install

Force libc6 dependency version.

Drop explicit libelf-dev install command, as it should be pre-installed by
Travis CI already, according to .travis.yaml.

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

diff --git a/.travis.yml b/.travis.yml
index 357d9d7..7f4d237 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,12 @@ stages:
 jobs:
     include:
         - stage: Builds & Tests
-          name: Kernel LATEST + selftests
+          name: Kernel 5.5.0 + selftests
+          language: bash
+          env: KERNEL=5.5.0
+          script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
+
+        - name: Kernel LATEST + selftests
           language: bash
           env: KERNEL=LATEST
           script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
@@ -46,11 +51,6 @@ jobs:
           env: KERNEL=4.9.0
           script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
 
-        - name: Kernel 5.5.0 + selftests
-          language: bash
-          env: KERNEL=5.5.0
-          script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
-
         - name: Debian Build
           language: bash
           install:        $CI_ROOT/managers/debian.sh SETUP
diff --git a/travis-ci/managers/ubuntu.sh b/travis-ci/managers/ubuntu.sh
index 2b00f65..6c38ca1 100755
--- a/travis-ci/managers/ubuntu.sh
+++ b/travis-ci/managers/ubuntu.sh
@@ -3,11 +3,8 @@ set -eux
 
 RELEASE="focal"
 
-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
-apt-get install -y libelf-dev pkg-config
+apt-get install -y pkg-config
 
 source "$(dirname $0)/travis_wait.bash"
 
diff --git a/travis-ci/vmtest/run_vmtest.sh b/travis-ci/vmtest/run_vmtest.sh
index b80585c..f2d9a05 100755
--- a/travis-ci/vmtest/run_vmtest.sh
+++ b/travis-ci/vmtest/run_vmtest.sh
@@ -17,7 +17,9 @@ 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/focal/ llvm-toolchain-focal main"
 sudo apt-get update
-sudo apt-get install -y clang-13 lld-13 llvm-13
+sudo apt-get install --allow-downgrades -y libc6=2.31-0ubuntu9.2
+sudo aptitude install -y g++ libelf-dev
+sudo aptitude install -y clang-13 lld-13 llvm-13
 
 travis_fold end install_clang