status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

integ-test: fix upgrade test for CE (#19673) 

* integ-test: fix upgrade test for CE
This commit is contained in:
cskh 2023-11-17 12:34:30 -05:00 committed by GitHub
parent 75c2def1ca
commit ce66433311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/nightly-test-integrations.yml vendored
View File

@ -406,7 +406,6 @@ jobs:
runs-on: ${{ fromJSON(needs.setup.outputs.compute-large ) }} runs-on: ${{ fromJSON(needs.setup.outputs.compute-large ) }}
needs: needs:
- setup - setup
- dev-build
permissions: permissions:
id-token: write # NOTE: this permission is explicitly required for Vault auth. id-token: write # NOTE: this permission is explicitly required for Vault auth.
contents: read contents: read
@ -445,7 +444,7 @@ jobs:
-- \ -- \
go test \ go test \
-tags "${{ env.GOTAGS }}" \ -tags "${{ env.GOTAGS }}" \
-timeout=60m \ -timeout=20m \
-parallel=2 \ -parallel=2 \
-json \ -json \
./... \ ./... \

10
test-integ/upgrade/basic/common.go
View File

@ -161,12 +161,12 @@ func newCommonTopo(t *testing.T) *commonTopo {
}, },
}, },
}, },
Enterprise: true, Enterprise: utils.IsEnterprise(),
InitialConfigEntries: []api.ConfigEntry{ InitialConfigEntries: []api.ConfigEntry{
&api.ProxyConfigEntry{ &api.ProxyConfigEntry{
Kind: api.ProxyDefaults, Kind: api.ProxyDefaults,
Name: "global", Name: "global",
Partition: "default", Partition: topoutil.ConfigEntryPartition("default"),
Config: map[string]any{ Config: map[string]any{
"protocol": "http", "protocol": "http",
}, },
@ -174,14 +174,12 @@ func newCommonTopo(t *testing.T) *commonTopo {
&api.ServiceConfigEntry{ &api.ServiceConfigEntry{
Kind: api.ServiceDefaults, Kind: api.ServiceDefaults,
Name: "static-server", Name: "static-server",
Partition: "default", Partition: topoutil.ConfigEntryPartition("default"),
Namespace: "default",
}, },
&api.ServiceIntentionsConfigEntry{ &api.ServiceIntentionsConfigEntry{
Kind: api.ServiceIntentions, Kind: api.ServiceIntentions,
Name: "static-server", Name: "static-server",
Partition: "default", Partition: topoutil.ConfigEntryPartition("default"),
Namespace: "default",
Sources: []*api.SourceIntention{ Sources: []*api.SourceIntention{
{ {
Name: "static-client", Name: "static-client",