Skip to content

Commit

Permalink
test-e2e: no need to run vaultcomat tests as root (#18215)
Browse files Browse the repository at this point in the history
6747ef8 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.
  • Loading branch information
shoenig authored Aug 15, 2023
1 parent 8833452 commit 6fca4fa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion e2e/vaultcompat/vaultcompat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
})
Expand Down
3 changes: 2 additions & 1 deletion testutil/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6fca4fa

Please sign in to comment.