Skip to content

Refactor e2e-tests.yml workflow #3627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 9, 2024
Merged

Refactor e2e-tests.yml workflow #3627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcce5a8
Move attach e2e tests into Go test suite
cmurphy Mar 26, 2024
7cede6d
Reorganize cross-platform attach tests
cmurphy Mar 26, 2024
69209ea
Move TSA MTLS tests into Go test suite
cmurphy Mar 27, 2024
2f674bb
Move TSA blob tests into Go test suite
cmurphy Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 4 additions & 30 deletions .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ on:
workflow_dispatch:

jobs:
e2e-secrets:
e2e-cross:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a later PR, do we want to change this to run on windows-latest too so we can remove the cross tag?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have to check that they work on windows. In this PR I just wanted to keep parity with the current platforms. The cross tag is to prevent the main e2e_test.go tests from running on macos, since they depend on docker and kind for fulcio/rekor which only seems to work on linux.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, I saw

cosign/.github/workflows/tests.yaml

Line 44 in 302aee6

os: [macos-latest, ubuntu-latest, windows-latest]
and thought e2e_tests was running on macos already. That's a separate job from

cosign/.github/workflows/tests.yaml

Line 88 in 302aee6

runs-on: ubuntu-latest
. So yea, keeping it as-is seems good

strategy:
matrix:
os: [macos-latest, ubuntu-latest]
Expand All @@ -45,34 +45,8 @@ jobs:
go-version: '1.21'
check-latest: true

- uses: imjasonh/setup-crane@00c9e93efa4e1138c9a7a5c594acd6c75a2fbf0c # v0.3

- name: Run e2e_test_attach.sh
shell: bash
run: ./test/e2e_test_attach.sh

e2e-tsa-mtls:
strategy:
matrix:
os: [macos-latest, ubuntu-latest]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: '1.21'
check-latest: true

- uses: imjasonh/setup-crane@00c9e93efa4e1138c9a7a5c594acd6c75a2fbf0c # v0.3

- name: Run e2e_tsa_mtls.sh
shell: bash
run: make && PATH="$PWD:$PATH" ./test/e2e_tsa_mtls.sh

- name: Run e2e_signblob_tsa_mtls.sh
shell: bash
run: make && PATH="$PWD:$PATH" ./test/e2e_signblob_tsa_mtls.sh
- name: Run cross platform e2e tests
run: go test -tags=e2e,cross -v ./test/...

e2e-test-pkcs11:
runs-on: ubuntu-latest
Expand All @@ -81,7 +55,7 @@ jobs:
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: '1.21'
go-version: '1.21'
check-latest: true

- name: Run pkcs11 end-to-end tests
Expand Down
Loading