Skip to content

Commit 39c5be1

Browse files
committed
ci: Use Consul Go version for Vault int tests
Unlike the Nomad tests (where Nomad is compiled from source and provides the tests), Vault is installed as a binary, and local Consul tests are run. Fixes incorrect version change introduced in #20058.
1 parent 6c65351 commit 39c5be1

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

.github/workflows/test-integrations.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ jobs:
8080
runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
8181
needs:
8282
- setup
83-
- get-go-version
8483
- dev-build
8584
permissions:
8685
id-token: write # NOTE: this permission is explicitly required for Vault auth.
@@ -95,7 +94,7 @@ jobs:
9594
repository: hashicorp/nomad
9695
ref: ${{ matrix.nomad-version }}
9796

98-
- name: Install Go (Nomad build)
97+
- name: Install Go
9998
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
10099
with:
101100
# Do not explicitly set Go version here, as it should depend on what Nomad declares.
@@ -114,11 +113,6 @@ jobs:
114113
- name: Make Nomad dev build
115114
run: make pkg/linux_amd64/nomad
116115

117-
- name: Install Go (Consul tests)
118-
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
119-
with:
120-
go-version: ${{ needs.get-go-version.outputs.go-version }}
121-
122116
- name: Run integration tests
123117
run: |
124118
go install gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} && \
@@ -183,17 +177,18 @@ jobs:
183177
if: ${{ endsWith(github.repository, '-enterprise') }}
184178
run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
185179

180+
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
181+
with:
182+
# We use the current Consul Go version here since Vault is installed as a binary
183+
# and tests are run from the Consul repo.
184+
go-version: ${{ needs.get-go-version.outputs.go-version }}
185+
186186
- name: Install Vault
187187
run: |
188188
wget -q -O /tmp/vault.zip "https://releases.hashicorp.com/vault/${{ env.VAULT_BINARY_VERSION }}/vault_${{ env.VAULT_BINARY_VERSION }}_linux_amd64.zip"
189189
unzip -d /tmp /tmp/vault.zip
190190
echo "/tmp" >> $GITHUB_PATH
191191
192-
- name: Install Go (Consul tests)
193-
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
194-
with:
195-
go-version: ${{ needs.get-go-version.outputs.go-version }}
196-
197192
- name: Run Connect CA Provider Tests
198193
run: |
199194
mkdir -p "${{ env.TEST_RESULTS_DIR }}"

0 commit comments

Comments
 (0)