From 3a60bc47a082d5e9ef4903d48ef3bdb505eb8b6e Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Mon, 30 Nov 2020 13:38:31 -0800
Subject: Ensure containerd is used from installed location.

Currently, if containerd is installed locally via tools/installers/containerd,
then it will not necessarily be used if containerd is installed in the system
path. This means that the existing containerd tests are all likely broken.

Also, use libbtrfs-dev instead of btrfs-tools, which is not actually required.

PiperOrigin-RevId: 344879109
---
 pkg/test/criutil/criutil.go    | 12 +++++++++---
 tools/installers/containerd.sh | 15 ++++++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkg/test/criutil/criutil.go b/pkg/test/criutil/criutil.go
index 70945f234..e41769017 100644
--- a/pkg/test/criutil/criutil.go
+++ b/pkg/test/criutil/criutil.go
@@ -54,14 +54,20 @@ func ResolvePath(executable string) string {
 		}
 	}
 
+	// Favor /usr/local/bin, if it exists.
+	localBin := fmt.Sprintf("/usr/local/bin/%s", executable)
+	if _, err := os.Stat(localBin); err == nil {
+		return localBin
+	}
+
 	// Try to find via the path.
-	guess, err := exec.LookPath(executable)
+	guess, _ := exec.LookPath(executable)
 	if err == nil {
 		return guess
 	}
 
-	// Return a default path.
-	return fmt.Sprintf("/usr/local/bin/%s", executable)
+	// Return a bare path; this generates a suitable error.
+	return executable
 }
 
 // NewCrictl returns a Crictl configured with a timeout and an endpoint over
diff --git a/tools/installers/containerd.sh b/tools/installers/containerd.sh
index 6b7bb261c..4bbbffeee 100755
--- a/tools/installers/containerd.sh
+++ b/tools/installers/containerd.sh
@@ -43,10 +43,23 @@ install_helper() {
       make install)
 }
 
+# Figure out were btrfs headers are.
+#
+# Ubuntu 16.04 has only btrfs-tools, while 18.04 has a transitional package,
+# and later versions no longer have the transitional package.
+source /etc/os-release
+declare BTRFS_DEV
+if [[ "${ID}" == "ubuntu" ]] && [[ "${VERSION_ID%.*}" -le "18" ]]; then
+  BTRFS_DEV="btrfs-tools"
+else
+  BTRFS_DEV="btrfs-dev"
+fi
+readonly BTRFS_DEV
+
 # Install dependencies for the crictl tests.
 while true; do
   if (apt-get update && apt-get install -y \
-      btrfs-tools \
+      "${BTRFS_DEV}" \
       libseccomp-dev); then
     break
   fi
-- 
cgit v1.2.3