fixup! [no-relnote] Switch to package installs for e2e tests

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

tests/e2e/installer.go

@@ -19,6 +19,7 @@ package e2e
 import (
 	"bytes"
 	"fmt"
+	"strings"
 	"text/template"
 )
 
@@ -35,7 +36,7 @@ set -xe
 
 cd {{.CacheDir}}/packages/ubuntu18.04/amd64
 
-dpkg -i libnvidia-container1_*_amd64.deb \
+{{if .WithSudo }}sudo {{end}}dpkg -i libnvidia-container1_*_amd64.deb \
 	libnvidia-container-tools_*_amd64.deb \
 	nvidia-container-toolkit-base_*_amd64.deb \
 	nvidia-container-toolkit_*_amd64.deb
@@ -81,7 +82,7 @@ func NewToolkitInstaller(opts ...installerOption) (*ToolkitInstaller, error) {
 // PrepareCache ensures that the installer (package) cache is created on the runner.
 // The can be used to ensure that docker is not REQUIRED in an inner container.
 func (i *ToolkitInstaller) PrepareCache(runner Runner) (string, string, error) {
-	renderedScript, err := i.renderScript(prepareInstallerCacheTemplate)
+	renderedScript, err := i.renderScript(prepareInstallerCacheTemplate, false)
 	if err != nil {
 		return "", "", err
 	}
@@ -90,24 +91,39 @@ func (i *ToolkitInstaller) PrepareCache(runner Runner) (string, string, error) {
 }
 
 func (i *ToolkitInstaller) Install(runner Runner) (string, string, error) {
-	renderedScript, err := i.renderScript(installFromImageTemplate)
+	uid, _, err := runner.Run("id -u")
+	if err != nil {
+		return "", "", err
+	}
+	withSudo := false
+	if strings.TrimSpace(uid) != "0" {
+		withSudo = true
+	}
+	renderedScript, err := i.renderScript(installFromImageTemplate, withSudo)
 	if err != nil {
 		return "", "", err
 	}
 
 	return runner.Run(renderedScript)
 }
 
-func (i *ToolkitInstaller) renderScript(scriptTemplate string) (string, error) {
+func (i *ToolkitInstaller) renderScript(scriptTemplate string, withSudo bool) (string, error) {
 	// Parse the combined template
 	tmpl, err := template.New("template").Parse(scriptTemplate)
 	if err != nil {
 		return "", fmt.Errorf("error parsing template: %w", err)
 	}
 
+	templateInfo := struct {
+		*ToolkitInstaller
+		WithSudo bool
+	}{
+		ToolkitInstaller: i,
+		WithSudo:         withSudo,
+	}
 	// Execute the template
 	var renderedScript bytes.Buffer
-	err = tmpl.Execute(&renderedScript, i)
+	err = tmpl.Execute(&renderedScript, templateInfo)
 	if err != nil {
 		return "", fmt.Errorf("error executing template: %w", err)
 	}