From 79cef18f8f652102e7f730f9c2a5550bbf38069b Mon Sep 17 00:00:00 2001
From: Mehdy Khoshnoody <mehdy.khoshnoody@gmail.com>
Date: Fri, 29 May 2020 12:19:08 +0430
Subject: [PATCH] ci: Use bionic dist for test environments

As bionic uses a newer version of linux we'd also be using
a newer version of krbd.

Signed-off-by: Mehdy Khoshnoody <mehdy.khoshnoody@gmail.com>
---
 .travis.yml         | 7 ++++---
 scripts/minikube.sh | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b5dabc206..30a8369f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 ---
 # need for docker build
 sudo: true
-dist: xenial
+dist: bionic
 
 addons:
   apt:
     packages:
-      - realpath
+      - coreutils
       - ruby
       - socat
 services:
@@ -41,7 +41,7 @@ before_install:
 before_script:
   - curl https://download.ceph.com/keys/release.asc | sudo apt-key add -
   - sudo apt-add-repository
-    "deb https://download.ceph.com/debian-nautilus xenial main"
+    "deb https://download.ceph.com/debian-nautilus $(lsb_release -sc) main"
   # Ceph does not guarantee arm64 builds, fallback to ceph 14.2.5
   # yamllint disable rule:line-length
   - test "$(arch)" != "aarch64" || sudo apt-add-repository
@@ -99,6 +99,7 @@ jobs:
 
     - stage: build testing
       name: cephcsi on Arm64
+      dist: xenial   # There are no arm64 builds available in bionic repo
       arch: arm64
       script:
         - scripts/skip-doc-change.sh || travis_terminate 0;
diff --git a/scripts/minikube.sh b/scripts/minikube.sh
index 6fff3caae..d645d22ca 100755
--- a/scripts/minikube.sh
+++ b/scripts/minikube.sh
@@ -78,7 +78,8 @@ fi
 K8S_FEATURE_GATES=${K8S_FEATURE_GATES:-"BlockVolume=true,CSIBlockVolume=true,VolumeSnapshotDataSource=true,ExpandCSIVolumes=true"}
 
 #extra-config for kube https://minikube.sigs.k8s.io/docs/reference/configuration/kubernetes/
-EXTRA_CONFIG=${EXTRA_CONFIG:-"--extra-config=apiserver.enable-admission-plugins=PodSecurityPolicy"}
+EXTRA_CONFIG=${EXTRA_CONFIG:-"--extra-config=apiserver.enable-admission-plugins=PodSecurityPolicy \
+  --extra-config=kubelet.resolv-conf=/run/systemd/resolve/resolv.conf"}
 
 #extra Rook configuration
 ROOK_BLOCK_POOL_NAME=${ROOK_BLOCK_POOL_NAME:-"newrbdpool"}