Skip to content

Commit e1f05eb

Browse files
committed
always test oss and conditionally test enterprise (#16827)
1 parent 232bee2 commit e1f05eb

File tree

3 files changed

+61
-3
lines changed

3 files changed

+61
-3
lines changed

.github/workflows/go-tests.yml

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
197197
consul-license: ${{secrets.CONSUL_LICENSE}}
198198

199-
go-test:
199+
go-test-oss:
200200
needs:
201201
- setup
202202
- dev-build
@@ -206,6 +206,22 @@ jobs:
206206
runner-count: 12
207207
runs-on: ${{ needs.setup.outputs.compute-xl }}
208208
repository-name: ${{ github.repository }}
209+
go-tags: ""
210+
secrets:
211+
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
212+
consul-license: ${{secrets.CONSUL_LICENSE}}
213+
214+
go-test-enterprise:
215+
needs:
216+
- setup
217+
- dev-build
218+
uses: ./.github/workflows/reusable-unit-split.yml
219+
with:
220+
directory: .
221+
runner-count: 12
222+
runs-on: ${{ needs.setup.outputs.compute-xl }}
223+
repository-name: ${{ github.repository }}
224+
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
209225
secrets:
210226
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
211227
consul-license: ${{secrets.CONSUL_LICENSE}}
@@ -221,6 +237,7 @@ jobs:
221237
package-names-command: "go list ./... | grep -E -v '^github.com/hashicorp/consul/agent(/consul|/local|/routine-leak-checker)?$' | grep -E -v '^github.com/hashicorp/consul(/command|/connect|/snapshot)'"
222238
runs-on: ${{ needs.setup.outputs.compute-xl }}
223239
repository-name: ${{ github.repository }}
240+
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
224241
secrets:
225242
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
226243
consul-license: ${{secrets.CONSUL_LICENSE}}
@@ -236,6 +253,35 @@ jobs:
236253
go-test-flags: 'export GO_TEST_FLAGS="-short"'
237254
runs-on: ${{ needs.setup.outputs.compute-xl }}
238255
repository-name: ${{ github.repository }}
256+
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
257+
secrets:
258+
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
259+
consul-license: ${{secrets.CONSUL_LICENSE}}
260+
261+
go-test-envoyextensions:
262+
needs:
263+
- setup
264+
- dev-build
265+
uses: ./.github/workflows/reusable-unit.yml
266+
with:
267+
directory: envoyextensions
268+
runs-on: ${{ needs.setup.outputs.compute-xl }}
269+
repository-name: ${{ github.repository }}
270+
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
271+
secrets:
272+
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
273+
consul-license: ${{secrets.CONSUL_LICENSE}}
274+
275+
go-test-troubleshoot:
276+
needs:
277+
- setup
278+
- dev-build
279+
uses: ./.github/workflows/reusable-unit.yml
280+
with:
281+
directory: troubleshoot
282+
runs-on: ${{ needs.setup.outputs.compute-xl }}
283+
repository-name: ${{ github.repository }}
284+
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
239285
secrets:
240286
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
241287
consul-license: ${{secrets.CONSUL_LICENSE}}
@@ -249,6 +295,7 @@ jobs:
249295
directory: api
250296
runs-on: ${{ needs.setup.outputs.compute-xl }}
251297
repository-name: ${{ github.repository }}
298+
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
252299
secrets:
253300
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
254301
consul-license: ${{secrets.CONSUL_LICENSE}}
@@ -262,6 +309,7 @@ jobs:
262309
directory: api
263310
runs-on: ${{ needs.setup.outputs.compute-xl }}
264311
repository-name: ${{ github.repository }}
312+
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
265313
secrets:
266314
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
267315
consul-license: ${{secrets.CONSUL_LICENSE}}
@@ -275,6 +323,7 @@ jobs:
275323
directory: sdk
276324
runs-on: ${{ needs.setup.outputs.compute-xl }}
277325
repository-name: ${{ github.repository }}
326+
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
278327
secrets:
279328
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
280329
consul-license: ${{secrets.CONSUL_LICENSE}}
@@ -288,6 +337,7 @@ jobs:
288337
directory: sdk
289338
runs-on: ${{ needs.setup.outputs.compute-xl }}
290339
repository-name: ${{ github.repository }}
340+
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
291341
secrets:
292342
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
293343
consul-license: ${{secrets.CONSUL_LICENSE}}

.github/workflows/reusable-unit-split.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ on:
3333
repository-name:
3434
required: true
3535
type: string
36+
go-tags:
37+
required: false
38+
type: string
39+
default: ""
3640
secrets:
3741
elevated-github-token:
3842
required: true
@@ -44,7 +48,7 @@ env:
4448
GOARCH: ${{inputs.go-arch}}
4549
TOTAL_RUNNERS: ${{inputs.runner-count}}
4650
CONSUL_LICENSE: ${{secrets.consul-license}}
47-
GOTAGS: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
51+
GOTAGS: ${{ inputs.go-tags}}
4852

4953
jobs:
5054
set-test-package-matrix:

.github/workflows/reusable-unit.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ on:
2929
repository-name:
3030
required: true
3131
type: string
32+
go-tags:
33+
required: false
34+
type: string
35+
default: ""
3236
secrets:
3337
elevated-github-token:
3438
required: true
@@ -39,7 +43,7 @@ env:
3943
GOTESTSUM_VERSION: 1.8.2
4044
GOARCH: ${{inputs.go-arch}}
4145
CONSUL_LICENSE: ${{secrets.consul-license}}
42-
GOTAGS: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
46+
GOTAGS: ${{ inputs.go-tags}}
4347

4448
jobs:
4549
go-test:

0 commit comments

Comments
 (0)