Skip to content

Commit ec6e833

Browse files
authored
workflows: Switch test token source (#1756)
"extremely-dangerous-public-oidc-beacon" has been very unreliable: switch it to the new Google Cloud Run conformance testing token publisher. * token should be updated more reliably * token is valid for at least 45 minutes Signed-off-by: Jussi Kukkonen <jkukkonen@google.com>
1 parent 39e34da commit ec6e833

2 files changed

Lines changed: 15 additions & 8 deletions

File tree

.github/workflows/cross-os.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ jobs:
4646
cache-dependency-path: pyproject.toml
4747
- run: pip install .
4848
- name: Fetch testing oidc token
49-
uses: sigstore-conformance/extremely-dangerous-public-oidc-beacon@4a8befcc16064dac9e97f210948d226e5c869bdc # v1.0.0
49+
run: |
50+
curl --fail --retry 3 --output oidc-token.txt \
51+
https://storage.googleapis.com/sigstore-conformance-testing-token/untrusted-testing-token.txt
5052
- name: Sign
5153
run: python -m sigstore --staging sign --identity-token $(cat oidc-token.txt) test/assets/a.txt
5254
- name: upload signature bundle
@@ -81,7 +83,8 @@ jobs:
8183
name: ${{ matrix.signed-with-os }}-bundle
8284
- name: Verify
8385
run: |
84-
python -m sigstore --staging verify github --verbose \
85-
--cert-identity "https://github.com/sigstore-conformance/extremely-dangerous-public-oidc-beacon/.github/workflows/extremely-dangerous-oidc-beacon.yml@refs/heads/main" \
86+
python -m sigstore --staging verify identity --verbose \
87+
--cert-identity "untrusted-sa@sigstore-conformance.iam.gserviceaccount.com" \
88+
--cert-oidc-issuer "https://accounts.google.com" \
8689
--bundle a.txt.sigstore.json \
8790
test/assets/a.txt

.github/workflows/cross-version-verify.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
cache-dependency-path: pyproject.toml
3939
- run: pip install .
4040
- name: Fetch testing oidc token
41-
uses: sigstore-conformance/extremely-dangerous-public-oidc-beacon@4a8befcc16064dac9e97f210948d226e5c869bdc # v1.0.0
41+
run: |
42+
curl --fail --retry 3 --output oidc-token.txt \
43+
https://storage.googleapis.com/sigstore-conformance-testing-token/untrusted-testing-token.txt
4244
- name: Sign
4345
run: |
4446
touch artifact
@@ -87,16 +89,18 @@ jobs:
8789
ENV_OPT: ${{ matrix.env == 'staging' && '--staging' || '' }}
8890
BUNDLE: artifact-${{matrix.env}}-rekor2.sigstore.json
8991
run: |
90-
python -m sigstore $ENV_OPT verify github --verbose \
91-
--cert-identity "https://github.com/sigstore-conformance/extremely-dangerous-public-oidc-beacon/.github/workflows/extremely-dangerous-oidc-beacon.yml@refs/heads/main" \
92+
python -m sigstore $ENV_OPT verify identity --verbose \
93+
--cert-identity "untrusted-sa@sigstore-conformance.iam.gserviceaccount.com" \
94+
--cert-oidc-issuer "https://accounts.google.com" \
9295
--bundle $BUNDLE \
9396
artifact
9497
- name: Verify (Rekor v1)
9598
env:
9699
ENV_OPT: ${{ matrix.env == 'staging' && '--staging' || '' }}
97100
BUNDLE: artifact-${{matrix.env}}-rekor1.sigstore.json
98101
run: |
99-
python -m sigstore $ENV_OPT verify github --verbose \
100-
--cert-identity "https://github.com/sigstore-conformance/extremely-dangerous-public-oidc-beacon/.github/workflows/extremely-dangerous-oidc-beacon.yml@refs/heads/main" \
102+
python -m sigstore $ENV_OPT verify identity --verbose \
103+
--cert-identity "untrusted-sa@sigstore-conformance.iam.gserviceaccount.com" \
104+
--cert-oidc-issuer "https://accounts.google.com" \
101105
--bundle $BUNDLE \
102106
artifact

0 commit comments

Comments
 (0)