From c0f6df7cfd21b53e72ab5dddef0db16b356cb9c8 Mon Sep 17 00:00:00 2001
From: Kris Hicks <khicks@hashicorp.com>
Date: Tue, 26 Jan 2021 11:42:23 -0800
Subject: [PATCH] Add test for alloc exec

---
 e2e/isolation/input/alloc_exec.nomad          | 25 ++++++
 .../input/{echo_pid.nomad => exec.nomad}      |  6 +-
 e2e/isolation/input/raw_exec.nomad            | 38 +++++++++
 e2e/isolation/isolation.go                    | 78 ++++++++++++++++---
 4 files changed, 133 insertions(+), 14 deletions(-)
 create mode 100644 e2e/isolation/input/alloc_exec.nomad
 rename e2e/isolation/input/{echo_pid.nomad => exec.nomad} (89%)
 create mode 100644 e2e/isolation/input/raw_exec.nomad

diff --git a/e2e/isolation/input/alloc_exec.nomad b/e2e/isolation/input/alloc_exec.nomad
new file mode 100644
index 000000000..4c36d4af6
--- /dev/null
+++ b/e2e/isolation/input/alloc_exec.nomad
@@ -0,0 +1,25 @@
+job "alloc_exec" {
+  datacenters = ["dc1"]
+  type        = "service"
+
+  constraint {
+    attribute = "${attr.kernel.name}"
+    value     = "linux"
+  }
+
+  group "main" {
+    task "main" {
+      driver = "exec"
+
+      config {
+        command = "/bin/sleep"
+        args = ["30s"]
+      }
+
+      resources {
+        cpu    = 100
+        memory = 64
+      }
+    }
+  }
+}
diff --git a/e2e/isolation/input/echo_pid.nomad b/e2e/isolation/input/exec.nomad
similarity index 89%
rename from e2e/isolation/input/echo_pid.nomad
rename to e2e/isolation/input/exec.nomad
index 9ebc167c4..67989c1c5 100644
--- a/e2e/isolation/input/echo_pid.nomad
+++ b/e2e/isolation/input/exec.nomad
@@ -1,4 +1,4 @@
-job "echo_pid" {
+job "exec" {
   datacenters = ["dc1"]
   type        = "batch"
 
@@ -7,8 +7,8 @@ job "echo_pid" {
     value     = "linux"
   }
 
-  group "echo_pid" {
-    task "echo_pid" {
+  group "exec" {
+    task "exec" {
       driver = "exec"
 
       config {
diff --git a/e2e/isolation/input/raw_exec.nomad b/e2e/isolation/input/raw_exec.nomad
new file mode 100644
index 000000000..f14604132
--- /dev/null
+++ b/e2e/isolation/input/raw_exec.nomad
@@ -0,0 +1,38 @@
+job "raw_exec" {
+  datacenters = ["dc1"]
+  type        = "batch"
+
+  constraint {
+    attribute = "${attr.kernel.name}"
+    value     = "linux"
+  }
+
+  group "raw_exec" {
+    task "raw_exec" {
+      driver = "raw_exec"
+
+      config {
+        command = "bash"
+        args = [
+          "-c", "local/pid.sh"
+        ]
+      }
+
+      template {
+        data = <<EOF
+#!/usr/bin/env bash
+echo my pid is $BASHPID
+EOF
+
+        destination = "local/pid.sh"
+        perms       = "777"
+        change_mode = "noop"
+      }
+
+      resources {
+        cpu    = 100
+        memory = 64
+      }
+    }
+  }
+}
diff --git a/e2e/isolation/isolation.go b/e2e/isolation/isolation.go
index 34cfd3c48..bc23b0bf1 100644
--- a/e2e/isolation/isolation.go
+++ b/e2e/isolation/isolation.go
@@ -1,8 +1,13 @@
 package isolation
 
 import (
+	"bytes"
+	"context"
 	"fmt"
+	"strings"
+	"time"
 
+	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/nomad/e2e/e2eutil"
 	"github.com/hashicorp/nomad/e2e/framework"
 	"github.com/hashicorp/nomad/helper/uuid"
@@ -31,14 +36,6 @@ func (tc *IsolationTest) BeforeAll(f *framework.F) {
 	e2eutil.WaitForNodesReady(t, tc.Nomad(), 1)
 }
 
-func (tc *IsolationTest) AfterEach(f *framework.F) {
-	for _, jobID := range tc.jobIDs {
-		tc.Nomad().Jobs().Deregister(jobID, true, nil)
-	}
-	tc.jobIDs = []string{}
-	tc.Nomad().System().GarbageCollect()
-}
-
 func (tc *IsolationTest) TestIsolation_ExecDriver_PIDNamespacing(f *framework.F) {
 	t := f.T()
 
@@ -51,11 +48,14 @@ func (tc *IsolationTest) TestIsolation_ExecDriver_PIDNamespacing(f *framework.F)
 
 	uuid := uuid.Generate()
 	jobID := "isolation-pid-namespace-" + uuid[0:8]
-	file := "isolation/input/echo_pid.nomad"
+	file := "isolation/input/exec.nomad"
 	allocs := e2eutil.RegisterAndWaitForAllocs(t, tc.Nomad(), file, jobID, "")
 	require.Equal(t, len(allocs), 1, fmt.Sprintf("failed to register %s", jobID))
 
 	tc.jobIDs = append(tc.jobIDs, jobID)
+	defer func() {
+		tc.Nomad().Jobs().Deregister(jobID, true, nil)
+	}()
 
 	allocID := allocs[0].ID
 	e2eutil.WaitForAllocStopped(t, tc.Nomad(), allocID)
@@ -66,6 +66,60 @@ func (tc *IsolationTest) TestIsolation_ExecDriver_PIDNamespacing(f *framework.F)
 	require.Contains(t, out, "my pid is 1\n")
 }
 
+func (tc *IsolationTest) TestIsolation_ExecDriver_PIDNamespacing_AllocExec(f *framework.F) {
+	t := f.T()
+
+	clientNodes, err := e2eutil.ListLinuxClientNodes(tc.Nomad())
+	require.Nil(t, err)
+
+	if len(clientNodes) == 0 {
+		t.Skip("no Linux clients")
+	}
+
+	uuid := uuid.Generate()
+	jobID := "isolation-pid-namespace-" + uuid[0:8]
+	file := "isolation/input/alloc_exec.nomad"
+	allocs := e2eutil.RegisterAndWaitForAllocs(t, tc.Nomad(), file, jobID, "")
+	require.Equal(t, len(allocs), 1, fmt.Sprintf("failed to register %s", jobID))
+
+	defer func() {
+		tc.Nomad().Jobs().Deregister(jobID, true, nil)
+	}()
+
+	allocID := allocs[0].ID
+	e2eutil.WaitForAllocRunning(t, tc.Nomad(), allocID)
+
+	alloc, _, err := tc.Nomad().Allocations().Info(allocID, nil)
+	require.NoError(t, err)
+	require.NotNil(t, alloc)
+
+	resizeCh := make(chan api.TerminalSize)
+	var tty bool
+
+	ctx, cancelFn := context.WithTimeout(context.Background(), 15*time.Second)
+	defer cancelFn()
+
+	var stdout, stderr bytes.Buffer
+
+	exitCode, err := tc.Nomad().Allocations().Exec(
+		ctx,
+		alloc,
+		"main",
+		tty,
+		[]string{"ps", "ax"},
+		bytes.NewReader([]byte("")),
+		&stdout,
+		&stderr,
+		resizeCh,
+		nil,
+	)
+	require.NoError(t, err)
+	require.Equal(t, 0, exitCode)
+
+	lines := strings.Split(strings.TrimSpace(stdout.String()), "\n")
+	require.Len(t, lines, 3)
+}
+
 func (tc *IsolationTest) TestIsolation_RawExecDriver_NoPIDNamespacing(f *framework.F) {
 	t := f.T()
 
@@ -78,12 +132,14 @@ func (tc *IsolationTest) TestIsolation_RawExecDriver_NoPIDNamespacing(f *framewo
 
 	uuid := uuid.Generate()
 	jobID := "isolation-pid-namespace-" + uuid[0:8]
-	file := "isolation/input/echo_pid_raw_exec.nomad"
+	file := "isolation/input/raw_exec.nomad"
 
 	allocs := e2eutil.RegisterAndWaitForAllocs(t, tc.Nomad(), file, jobID, "")
 	require.Equal(t, len(allocs), 1, fmt.Sprintf("failed to register %s", jobID))
 
-	tc.jobIDs = append(tc.jobIDs, jobID)
+	defer func() {
+		tc.Nomad().Jobs().Deregister(jobID, true, nil)
+	}()
 
 	allocID := allocs[0].ID
 	e2eutil.WaitForAllocStopped(t, tc.Nomad(), allocID)