Skip to content

Commit 1dddb86

Browse files
edewataedewata
committed
Clean up OCSP tests
1 parent 87d4d5e commit 1dddb86

6 files changed

Lines changed: 63 additions & 190 deletions

File tree

‎.github/workflows/ocsp-cmc-test.yml‎

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,18 @@ jobs:
3333
tests/bin/ds-create.sh \
3434
--image=${{ env.DS_IMAGE }} \
3535
--hostname=cads.example.com \
36+
--network=example \
37+
--network-alias=cads.example.com \
3638
--password=Secret.123 \
3739
cads
3840
39-
- name: Connect CA DS container to network
40-
run: docker network connect example cads --alias cads.example.com
41-
4241
- name: Set up CA container
4342
run: |
44-
tests/bin/runner-init.sh ca
45-
env:
46-
HOSTNAME: ca.example.com
47-
48-
- name: Connect CA container to network
49-
run: docker network connect example ca --alias ca.example.com
43+
tests/bin/runner-init.sh \
44+
--hostname=ca.example.com \
45+
--network=example \
46+
--network-alias=ca.example.com \
47+
ca
5048
5149
- name: Install CA in CA container
5250
run: |
@@ -76,20 +74,18 @@ jobs:
7674
tests/bin/ds-create.sh \
7775
--image=${{ env.DS_IMAGE }} \
7876
--hostname=ocspds.example.com \
77+
--network=example \
78+
--network-alias=ocspds.example.com \
7979
--password=Secret.123 \
8080
ocspds
8181
82-
- name: Connect OCSP DS container to network
83-
run: docker network connect example ocspds --alias ocspds.example.com
84-
8582
- name: Set up OCSP container
8683
run: |
87-
tests/bin/runner-init.sh ocsp
88-
env:
89-
HOSTNAME: ocsp.example.com
90-
91-
- name: Connect OCSP container to network
92-
run: docker network connect example ocsp --alias ocsp.example.com
84+
tests/bin/runner-init.sh \
85+
--hostname=ocsp.example.com \
86+
--network=example \
87+
--network-alias=ocsp.example.com \
88+
ocsp
9389
9490
- name: Install OCSP in OCSP container (step 1)
9591
run: |
@@ -270,15 +266,6 @@ jobs:
270266
--pkcs12-password Secret.123
271267
docker exec ocsp pki -n ocspadmin ocsp-user-show ocspadmin
272268
273-
- name: Gather artifacts
274-
if: always()
275-
run: |
276-
tests/bin/ds-artifacts-save.sh cads
277-
tests/bin/pki-artifacts-save.sh ca
278-
tests/bin/ds-artifacts-save.sh ocspds
279-
tests/bin/pki-artifacts-save.sh ocsp
280-
continue-on-error: true
281-
282269
- name: Remove OCSP from OCSP container
283270
run: docker exec ocsp pkidestroy -s OCSP -v
284271

@@ -324,10 +311,3 @@ jobs:
324311
if: always()
325312
run: |
326313
docker exec ocsp find /var/lib/pki/pki-tomcat/logs/ocsp -name "debug.*" -exec cat {} \;
327-
328-
- name: Upload artifacts
329-
if: always()
330-
uses: actions/upload-artifact@v4
331-
with:
332-
name: ocsp-cmc
333-
path: /tmp/artifacts

‎.github/workflows/ocsp-container-test.yml‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -781,34 +781,3 @@ jobs:
781781
if: always()
782782
run: |
783783
docker logs client
784-
785-
- name: Gather artifacts
786-
if: always()
787-
run: |
788-
tests/bin/ds-artifacts-save.sh cads
789-
790-
mkdir -p /tmp/artifacts/ca
791-
cp -r ca/certs /tmp/artifacts/ca
792-
cp -r ca/conf /tmp/artifacts/ca
793-
cp -r ca/logs /tmp/artifacts/ca
794-
795-
docker logs ca > /tmp/artifacts/ca/container.out 2> /tmp/artifacts/ca/container.err
796-
797-
tests/bin/ds-artifacts-save.sh ocspds
798-
799-
mkdir -p /tmp/artifacts/ocsp
800-
cp -r ocsp/certs /tmp/artifacts/ocsp
801-
cp -r ocsp/conf /tmp/artifacts/ocsp
802-
cp -r ocsp/logs /tmp/artifacts/ocsp
803-
804-
docker logs ocsp > /tmp/artifacts/ocsp/container.out 2> /tmp/artifacts/ocsp/container.err
805-
806-
mkdir -p /tmp/artifacts/client
807-
docker logs client > /tmp/artifacts/client/container.out 2> /tmp/artifacts/client/container.err
808-
809-
- name: Upload artifacts
810-
if: always()
811-
uses: actions/upload-artifact@v4
812-
with:
813-
name: ocsp-container
814-
path: /tmp/artifacts

‎.github/workflows/ocsp-crl-direct-test.yml‎

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,18 @@ jobs:
3939
tests/bin/ds-create.sh \
4040
--image=${{ env.DS_IMAGE }} \
4141
--hostname=cads.example.com \
42+
--network=example \
43+
--network-alias=cads.example.com \
4244
--password=Secret.123 \
4345
cads
4446
45-
- name: Connect CA DS container to network
46-
run: docker network connect example cads --alias cads.example.com
47-
4847
- name: Set up CA container
4948
run: |
50-
tests/bin/runner-init.sh ca
51-
env:
52-
HOSTNAME: ca.example.com
53-
54-
- name: Connect CA container to network
55-
run: docker network connect example ca --alias ca.example.com
49+
tests/bin/runner-init.sh \
50+
--hostname=ca.example.com \
51+
--network=example \
52+
--network-alias=ca.example.com \
53+
ca
5654
5755
- name: Install CA in CA container
5856
run: |
@@ -80,20 +78,18 @@ jobs:
8078
tests/bin/ds-create.sh \
8179
--image=${{ env.DS_IMAGE }} \
8280
--hostname=ocspds.example.com \
81+
--network=example \
82+
--network-alias=ocspds.example.com \
8383
--password=Secret.123 \
8484
ocspds
8585
86-
- name: Connect OCSP DS container to network
87-
run: docker network connect example ocspds --alias ocspds.example.com
88-
8986
- name: Set up OCSP container
9087
run: |
91-
tests/bin/runner-init.sh ocsp
92-
env:
93-
HOSTNAME: ocsp.example.com
94-
95-
- name: Connect OCSP container to network
96-
run: docker network connect example ocsp --alias ocsp.example.com
88+
tests/bin/runner-init.sh \
89+
--hostname=ocsp.example.com \
90+
--network=example \
91+
--network-alias=ocsp.example.com \
92+
ocsp
9793
9894
- name: Install OCSP in OCSP container (step 1)
9995
run: |
@@ -419,15 +415,6 @@ jobs:
419415
echo good > expected
420416
diff expected actual
421417
422-
- name: Gather artifacts from CA containers
423-
if: always()
424-
run: |
425-
tests/bin/ds-artifacts-save.sh cads
426-
tests/bin/pki-artifacts-save.sh ca
427-
tests/bin/ds-artifacts-save.sh ocspds
428-
tests/bin/pki-artifacts-save.sh ocsp
429-
continue-on-error: true
430-
431418
- name: Remove OCSP from OCSP container
432419
run: docker exec ocsp pkidestroy -s OCSP -v
433420

@@ -473,10 +460,3 @@ jobs:
473460
if: always()
474461
run: |
475462
docker exec ocsp find /var/lib/pki/pki-tomcat/logs/ocsp -name "debug.*" -exec cat {} \;
476-
477-
- name: Upload artifacts
478-
if: always()
479-
uses: actions/upload-artifact@v4
480-
with:
481-
name: ocsp-crl-direct
482-
path: /tmp/artifacts

‎.github/workflows/ocsp-external-certs-test.yml‎

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,18 @@ jobs:
3333
tests/bin/ds-create.sh \
3434
--image=${{ env.DS_IMAGE }} \
3535
--hostname=cads.example.com \
36+
--network=example \
37+
--network-alias=cads.example.com \
3638
--password=Secret.123 \
3739
cads
3840
39-
- name: Connect CA DS container to network
40-
run: docker network connect example cads --alias cads.example.com
41-
4241
- name: Set up CA container
4342
run: |
44-
tests/bin/runner-init.sh ca
45-
env:
46-
HOSTNAME: ca.example.com
47-
48-
- name: Connect CA container to network
49-
run: docker network connect example ca --alias ca.example.com
43+
tests/bin/runner-init.sh \
44+
--hostname=ca.example.com \
45+
--network=example \
46+
--network-alias=ca.example.com \
47+
ca
5048
5149
- name: Install CA in CA container
5250
run: |
@@ -76,20 +74,18 @@ jobs:
7674
tests/bin/ds-create.sh \
7775
--image=${{ env.DS_IMAGE }} \
7876
--hostname=ocspds.example.com \
77+
--network=example \
78+
--network-alias=ocspds.example.com \
7979
--password=Secret.123 \
8080
ocspds
8181
82-
- name: Connect OCSP DS container to network
83-
run: docker network connect example ocspds --alias ocspds.example.com
84-
8582
- name: Set up OCSP container
8683
run: |
87-
tests/bin/runner-init.sh ocsp
88-
env:
89-
HOSTNAME: ocsp.example.com
90-
91-
- name: Connect OCSP container to network
92-
run: docker network connect example ocsp --alias ocsp.example.com
84+
tests/bin/runner-init.sh \
85+
--hostname=ocsp.example.com \
86+
--network=example \
87+
--network-alias=ocsp.example.com \
88+
ocsp
9389
9490
- name: Install OCSP in OCSP container (step 1)
9591
run: |
@@ -196,15 +192,6 @@ jobs:
196192
--pkcs12-password Secret.123
197193
docker exec ocsp pki -n ocspadmin ocsp-user-show ocspadmin
198194
199-
- name: Gather artifacts
200-
if: always()
201-
run: |
202-
tests/bin/ds-artifacts-save.sh cads
203-
tests/bin/pki-artifacts-save.sh ca
204-
tests/bin/ds-artifacts-save.sh ocspds
205-
tests/bin/pki-artifacts-save.sh ocsp
206-
continue-on-error: true
207-
208195
- name: Remove OCSP from OCSP container
209196
run: docker exec ocsp pkidestroy -s OCSP -v
210197

@@ -250,10 +237,3 @@ jobs:
250237
if: always()
251238
run: |
252239
docker exec ocsp find /var/lib/pki/pki-tomcat/logs/ocsp -name "debug.*" -exec cat {} \;
253-
254-
- name: Upload artifacts
255-
if: always()
256-
uses: actions/upload-artifact@v4
257-
with:
258-
name: ocsp-external-certs
259-
path: /tmp/artifacts

‎.github/workflows/ocsp-hsm-test.yml‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,18 @@ jobs:
3333
tests/bin/ds-create.sh \
3434
--image=${{ env.DS_IMAGE }} \
3535
--hostname=ds.example.com \
36+
--network=example \
37+
--network-alias=ds.example.com \
3638
--password=Secret.123 \
3739
ds
3840
39-
- name: Connect DS container to network
40-
run: docker network connect example ds --alias ds.example.com
41-
4241
- name: Set up PKI container
4342
run: |
44-
tests/bin/runner-init.sh pki
45-
env:
46-
HOSTNAME: pki.example.com
47-
48-
- name: Connect PKI container to network
49-
run: docker network connect example pki --alias pki.example.com
43+
tests/bin/runner-init.sh \
44+
--hostname=pki.example.com \
45+
--network=example \
46+
--network-alias=pki.example.com \
47+
pki
5048
5149
- name: Install dependencies
5250
run: |
@@ -206,13 +204,6 @@ jobs:
206204
--pkcs12-password Secret.123
207205
docker exec pki pki -n caadmin ocsp-user-show ocspadmin
208206
209-
- name: Gather artifacts
210-
if: always()
211-
run: |
212-
tests/bin/ds-artifacts-save.sh ds
213-
tests/bin/pki-artifacts-save.sh pki
214-
continue-on-error: true
215-
216207
- name: Remove OCSP
217208
run: docker exec pki pkidestroy -s OCSP -v
218209

@@ -248,10 +239,3 @@ jobs:
248239
if: always()
249240
run: |
250241
docker exec pki find /var/lib/pki/pki-tomcat/logs/ocsp -name "debug.*" -exec cat {} \;
251-
252-
- name: Upload artifacts
253-
if: always()
254-
uses: actions/upload-artifact@v4
255-
with:
256-
name: ocsp-hsm
257-
path: /tmp/artifacts

0 commit comments

Comments
 (0)