From 6fca4fa715fcfe5c4a214e90f72c54cda7da6efd Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Tue, 15 Aug 2023 16:00:54 -0500 Subject: [PATCH] test-e2e: no need to run vaultcomat tests as root (#18215) 6747ef8803 fixes the Nomad client to support using the raw_exec driver while running as a non-root user. Remove the use of sudo in the test-e2e workflow for running integration (vaultcompat) tests. --- .github/workflows/test-e2e.yml | 5 +---- e2e/vaultcompat/vaultcompat_test.go | 3 ++- testutil/server.go | 3 ++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 9b46f2b9f10..b29d3fe6a88 100644 --- 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 index b269ddf788b..5c3d65417df 100644 --- a/e2e/vaultcompat/vaultcompat_test.go +++ b/e2e/vaultcompat/vaultcompat_test.go @@ -134,7 +134,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 = testlog.HCLoggerTestLevel().String() }) diff --git a/testutil/server.go b/testutil/server.go index 1aa70d15e8c..72a0664f2e0 100644 --- a/testutil/server.go +++ b/testutil/server.go @@ -78,7 +78,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