luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Backport of go-tests: disable s390x into release/1.16.x (#18278) 

backport of commit 785f10ed121952ff3aef1b1b69358a7cb9812c84

Co-authored-by: Dan Bond <danbond@protonmail.com>
This commit is contained in:
hc-github-team-consul-core 2023-07-25 14:25:41 -04:00 committed by GitHub
parent fee32407f1
commit a3c124ce4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.github/workflows/go-tests.yml vendored
View File

@ -184,18 +184,18 @@ jobs:
secrets: secrets:
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
dev-build-s390x: # dev-build-s390x:
if: ${{ endsWith(github.repository, '-enterprise') }} # if: ${{ endsWith(github.repository, '-enterprise') }}
needs: # needs:
- setup # - setup
uses: ./.github/workflows/reusable-dev-build.yml # uses: ./.github/workflows/reusable-dev-build.yml
with: # with:
uploaded-binary-name: 'consul-bin-s390x' # uploaded-binary-name: 'consul-bin-s390x'
runs-on: ${{ needs.setup.outputs.compute-xl }} # runs-on: ${{ needs.setup.outputs.compute-xl }}
go-arch: "s390x" # go-arch: "s390x"
repository-name: ${{ github.repository }} # repository-name: ${{ github.repository }}
secrets: # secrets:
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} # elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
# dev-build-arm64: # dev-build-arm64:
# # only run on enterprise because GHA does not have arm64 runners in OSS # # only run on enterprise because GHA does not have arm64 runners in OSS
@ -309,26 +309,26 @@ jobs:
consul-license: ${{secrets.CONSUL_LICENSE}} consul-license: ${{secrets.CONSUL_LICENSE}}
datadog-api-key: "${{ !endsWith(github.repository, '-enterprise') && secrets.DATADOG_API_KEY || '' }}" datadog-api-key: "${{ !endsWith(github.repository, '-enterprise') && secrets.DATADOG_API_KEY || '' }}"
go-test-s390x: # go-test-s390x:
if: ${{ endsWith(github.repository, '-enterprise') }} # if: ${{ endsWith(github.repository, '-enterprise') }}
needs: # needs:
- setup # - setup
- dev-build-s390x # - dev-build-s390x
uses: ./.github/workflows/reusable-unit.yml # uses: ./.github/workflows/reusable-unit.yml
with: # with:
uploaded-binary-name: 'consul-bin-s390x' # uploaded-binary-name: 'consul-bin-s390x'
directory: . # directory: .
go-test-flags: 'export GO_TEST_FLAGS="-short"' # go-test-flags: 'export GO_TEST_FLAGS="-short"'
runs-on: ${{ needs.setup.outputs.compute-xl }} # runs-on: ${{ needs.setup.outputs.compute-xl }}
repository-name: ${{ github.repository }} # repository-name: ${{ github.repository }}
go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}" # go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
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
secrets: # secrets:
elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }} # elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
consul-license: ${{secrets.CONSUL_LICENSE}} # consul-license: ${{secrets.CONSUL_LICENSE}}
datadog-api-key: "${{ !endsWith(github.repository, '-enterprise') && secrets.DATADOG_API_KEY || '' }}" # datadog-api-key: "${{ !endsWith(github.repository, '-enterprise') && secrets.DATADOG_API_KEY || '' }}"
go-test-envoyextensions: go-test-envoyextensions:
needs: needs:
@ -483,7 +483,7 @@ jobs:
- go-test-sdk-1-19 - go-test-sdk-1-19
- go-test-sdk-1-20 - go-test-sdk-1-20
- go-test-32bit - go-test-32bit
- go-test-s390x # - go-test-s390x
runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }} runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
if: ${{ always() }} if: ${{ always() }}
steps: steps: