backport of commit 6fca4fa (#18491)

Co-authored-by: Seth Hoenig <[email protected]>
hashicorp · Sep 13, 2023 · df53cfc · df53cfc
1 parent f0048e1
commit df53cfc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -49,10 +49,7 @@ jobs:
       - uses: hashicorp/setup-golang@v1
       - run: make deps
       - name: Vault Compatability
-        run: |
-          sudo sed -i 's!Defaults!#Defaults!g' /etc/sudoers
-          sudo -E env "PATH=$PATH" make integration-test
-          sudo -E env "PATH=$PATH" make clean
+        run: make integration-test
       - run: make e2e-test
 permissions:
   contents: read

diff --git a/e2e/vaultcompat/vaultcompat_test.go b/e2e/vaultcompat/vaultcompat_test.go
@@ -133,7 +133,8 @@ func startNomad(t *testing.T, vc *vaultapi.Client) (func(), *nomadapi.Client) {
 		}
 		c.DevMode = true
 		c.Client = &testutil.ClientConfig{
-			Enabled: true,
+			Enabled:      true,
+			TotalCompute: 1000,
 		}
 		c.LogLevel = "off"
 	})

diff --git a/testutil/server.go b/testutil/server.go
@@ -75,7 +75,8 @@ type ServerConfig struct {
 
 // ClientConfig is used to configure the client
 type ClientConfig struct {
-	Enabled bool `json:"enabled"`
+	Enabled      bool `json:"enabled"`
+	TotalCompute int  `json:"cpu_total_compute"`
 }
 
 // VaultConfig is used to configure Vault