Skip to content

Commit

Permalink
backport of commit efbbcef
Browse files Browse the repository at this point in the history
  • Loading branch information
rboyer committed Nov 7, 2023
1 parent cb5dbc0 commit cfd4ee1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ jobs:
go-version-file: 'go.mod'
- run: go env
- name: Build image
run: make test-compat-integ-setup
run: make test-deployer-setup
- name: Integration Tests
run: |
mkdir -p "${{ env.TEST_RESULTS_DIR }}"
Expand Down
2 changes: 1 addition & 1 deletion test-integ/peering_commontopo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ These peering tests all use a `commonTopo` (read: "common topology") to enable s
To run these tests, you will need to have docker installed. Next, make sure that you have all the required consul containers built:

```
make test-compat-integ-setup
make test-deployer-setup
```

## Non-Shared CommonTopo Tests
Expand Down
2 changes: 1 addition & 1 deletion test-integ/topoutil/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TargetImages() topology.Images {
}

// We want the image overridden by the local build produced by
// 'make test-compat-integ-setup' or 'make dev-docker'.
// 'make test-deployer-setup' or 'make dev-docker'.
testImages := utils.TargetImages()
images = images.OverrideWith(testImages)

Expand Down

0 comments on commit cfd4ee1

Please sign in to comment.