Skip to content

Commit 302aee6

Browse files
cmurphycmurphy
authored
Refactor e2e-tests.yml workflow (#3627)
* Move attach e2e tests into Go test suite Run the e2e_test_attach.sh tests in Go, as a step toward making all the e2e tests consistent with one another. This also has the added benefit of no longer relying on ttl.sh since test images are hosted in the mock registry server. These tests were being run in CI under Linux and Mac, since they don't rely on a Kind instance or any Sigstore services. This change updates the GitHub workflow for the attach tests to simply run all e2e tests that are compatible with the macos runner. Signed-off-by: Colleen Murphy <[email protected]> * Reorganize cross-platform attach tests Move all the e2e tests for cosign attachments that can be run independently without other Sigstore services into the new e2e_attach_test.go file, to make the main e2e_test.go file a more mantainable size and to get the benefit of running these tests in the e2e-cross job which runs on macos and linux. Signed-off-by: Colleen Murphy <[email protected]> * Move TSA MTLS tests into Go test suite Run the e2e_tsa_mtls.sh tests in Go. With this, a separate step to run the script is unnecessary for the Github workflow, since it will be run as part of the e2e-cross job. Signed-off-by: Colleen Murphy <[email protected]> * Move TSA blob tests into Go test suite Run the e2e_signblob_tsa_mtls.sh tests in Go. The e2e-tsa-mtls job in the e2e-tests workflow is fully removed since these are now all covered in e2e-cross. Signed-off-by: Colleen Murphy <[email protected]> --------- Signed-off-by: Colleen Murphy <[email protected]>
1 parent d0b9861 commit 302aee6

24 files changed

+1070
-1661
lines changed

‎.github/workflows/e2e-tests.yml

+4-30
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
workflow_dispatch:
3333

3434
jobs:
35-
e2e-secrets:
35+
e2e-cross:
3636
strategy:
3737
matrix:
3838
os: [macos-latest, ubuntu-latest]
@@ -45,34 +45,8 @@ jobs:
4545
go-version: '1.21'
4646
check-latest: true
4747

48-
- uses: imjasonh/setup-crane@00c9e93efa4e1138c9a7a5c594acd6c75a2fbf0c # v0.3
49-
50-
- name: Run e2e_test_attach.sh
51-
shell: bash
52-
run: ./test/e2e_test_attach.sh
53-
54-
e2e-tsa-mtls:
55-
strategy:
56-
matrix:
57-
os: [macos-latest, ubuntu-latest]
58-
runs-on: ${{ matrix.os }}
59-
60-
steps:
61-
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
62-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
63-
with:
64-
go-version: '1.21'
65-
check-latest: true
66-
67-
- uses: imjasonh/setup-crane@00c9e93efa4e1138c9a7a5c594acd6c75a2fbf0c # v0.3
68-
69-
- name: Run e2e_tsa_mtls.sh
70-
shell: bash
71-
run: make && PATH="$PWD:$PATH" ./test/e2e_tsa_mtls.sh
72-
73-
- name: Run e2e_signblob_tsa_mtls.sh
74-
shell: bash
75-
run: make && PATH="$PWD:$PATH" ./test/e2e_signblob_tsa_mtls.sh
48+
- name: Run cross platform e2e tests
49+
run: go test -tags=e2e,cross -v ./test/...
7650

7751
e2e-test-pkcs11:
7852
runs-on: ubuntu-latest
@@ -81,7 +55,7 @@ jobs:
8155
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
8256
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
8357
with:
84-
go-version: '1.21'
58+
go-version: '1.21'
8559
check-latest: true
8660

8761
- name: Run pkcs11 end-to-end tests

0 commit comments

Comments
 (0)