From a3d3607d3b4a209bc9d4c7f719cc4f23ac591d13 Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Wed, 5 Apr 2023 19:33:26 -0400 Subject: [PATCH] always test oss and conditionally test enterprise (#16827) (#16897) Co-authored-by: John Murret --- .github/workflows/go-tests.yml | 28 +++++++++++++++++++++-- .github/workflows/reusable-unit-split.yml | 6 ++++- .github/workflows/reusable-unit.yml | 6 ++++- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index 219e98db63..ca90ac31d3 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -212,8 +212,8 @@ jobs: secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} - - go-test: + + go-test-oss: needs: - setup - dev-build @@ -223,6 +223,22 @@ jobs: runner-count: 12 runs-on: ${{ needs.setup.outputs.compute-xl }} repository-name: ${{ github.repository }} + go-tags: "" + secrets: + elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} + consul-license: ${{secrets.CONSUL_LICENSE}} + + go-test-enterprise: + needs: + - setup + - dev-build + uses: ./.github/workflows/reusable-unit-split.yml + with: + directory: . + runner-count: 12 + runs-on: ${{ needs.setup.outputs.compute-xl }} + repository-name: ${{ github.repository }} + go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} @@ -238,6 +254,7 @@ jobs: 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)'" runs-on: ${{ needs.setup.outputs.compute-xl }} repository-name: ${{ github.repository }} + go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} @@ -253,6 +270,7 @@ jobs: go-test-flags: 'export GO_TEST_FLAGS="-short"' runs-on: ${{ needs.setup.outputs.compute-xl }} repository-name: ${{ github.repository }} + go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} @@ -266,6 +284,7 @@ jobs: directory: envoyextensions runs-on: ${{ needs.setup.outputs.compute-xl }} repository-name: ${{ github.repository }} + go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} @@ -279,6 +298,7 @@ jobs: directory: troubleshoot runs-on: ${{ needs.setup.outputs.compute-xl }} repository-name: ${{ github.repository }} + go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} @@ -292,6 +312,7 @@ jobs: directory: api runs-on: ${{ needs.setup.outputs.compute-xl }} repository-name: ${{ github.repository }} + go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} @@ -305,6 +326,7 @@ jobs: directory: api runs-on: ${{ needs.setup.outputs.compute-xl }} repository-name: ${{ github.repository }} + go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} @@ -318,6 +340,7 @@ jobs: directory: sdk runs-on: ${{ needs.setup.outputs.compute-xl }} repository-name: ${{ github.repository }} + go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} @@ -331,6 +354,7 @@ jobs: directory: sdk runs-on: ${{ needs.setup.outputs.compute-xl }} repository-name: ${{ github.repository }} + go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" secrets: elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} consul-license: ${{secrets.CONSUL_LICENSE}} diff --git a/.github/workflows/reusable-unit-split.yml b/.github/workflows/reusable-unit-split.yml index 5049cfaa5f..0131582b0b 100644 --- a/.github/workflows/reusable-unit-split.yml +++ b/.github/workflows/reusable-unit-split.yml @@ -33,6 +33,10 @@ on: repository-name: required: true type: string + go-tags: + required: false + type: string + default: "" secrets: elevated-github-token: required: true @@ -44,7 +48,7 @@ env: GOARCH: ${{inputs.go-arch}} TOTAL_RUNNERS: ${{inputs.runner-count}} CONSUL_LICENSE: ${{secrets.consul-license}} - GOTAGS: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" + GOTAGS: ${{ inputs.go-tags}} jobs: set-test-package-matrix: diff --git a/.github/workflows/reusable-unit.yml b/.github/workflows/reusable-unit.yml index b474b4c69b..fde340bd5e 100644 --- a/.github/workflows/reusable-unit.yml +++ b/.github/workflows/reusable-unit.yml @@ -29,6 +29,10 @@ on: repository-name: required: true type: string + go-tags: + required: false + type: string + default: "" secrets: elevated-github-token: required: true @@ -39,7 +43,7 @@ env: GOTESTSUM_VERSION: 1.8.2 GOARCH: ${{inputs.go-arch}} CONSUL_LICENSE: ${{secrets.consul-license}} - GOTAGS: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" + GOTAGS: ${{ inputs.go-tags}} jobs: go-test: