Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test-e2e: no need to run vaultcomat tests as root #18215

Merged
merged 1 commit into from
Aug 15, 2023
Merged

test-e2e: no need to run vaultcomat tests as root #18215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/test-e2e.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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