Skip to content

Commit

Permalink
Update DS test scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
edewata committed Aug 31, 2024
1 parent 8f0b1a7 commit 27530d9
Show file tree
Hide file tree
Showing 6 changed files with 656 additions and 38 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/pki-ca-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on: workflow_call

env:
NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || 'dogtagpki' }}
DS_IMAGE: ${{ vars.DS_IMAGE || 'jss-runner' }}

jobs:
test:
Expand All @@ -29,8 +30,10 @@ jobs:

- name: Set up DS container
run: |
tests/bin/runner-init.sh \
tests/bin/ds-create.sh \
--image=${{ env.DS_IMAGE }} \
--hostname=ds.example.com \
--password=Secret.123 \
--network=example \
--network-alias=ds.example.com \
ds
Expand Down Expand Up @@ -76,7 +79,6 @@ jobs:
- name: Install packages
run: |
# install packages on server
docker exec ds dnf install -y 389-ds-base
docker cp /tmp/RPMS/. pki:/root/RPMS/
docker exec pki bash -c "dnf localinstall -y /root/RPMS/*"
Expand All @@ -88,15 +90,12 @@ jobs:
docker cp /tmp/RPMS/. client2:/root/RPMS/
docker exec client2 bash -c "dnf localinstall -y /root/RPMS/*"
- name: Install DS
run: docker exec ds ${SHARED}/tests/bin/ds-create.sh

- name: Install CA
run: |
docker exec pki pkispawn \
-f /usr/share/pki/server/examples/installation/ca.cfg \
-s CA \
-D pki_ds_url=ldap://ds.example.com:389 \
-D pki_ds_url=ldap://ds.example.com:3389 \
-v
# set buffer size to 0 so that revocation takes effect immediately
Expand Down Expand Up @@ -529,14 +528,16 @@ jobs:
- name: Remove CA
run: docker exec pki pkidestroy -i pki-tomcat -s CA -v

- name: Remove DS
run: docker exec ds ${SHARED}/tests/bin/ds-remove.sh

- name: Check DS server systemd journal
if: always()
run: |
docker exec ds journalctl -x --no-pager -u [email protected]
- name: Check DS container logs
if: always()
run: |
docker logs ds
- name: Check PKI server systemd journal
if: always()
run: |
Expand Down
26 changes: 15 additions & 11 deletions .github/workflows/pki-tps-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on: workflow_call

env:
NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || 'dogtagpki' }}
DS_IMAGE: ${{ vars.DS_IMAGE || 'jss-runner' }}

jobs:
test:
Expand All @@ -29,8 +30,10 @@ jobs:

- name: Set up DS container
run: |
tests/bin/runner-init.sh \
tests/bin/ds-create.sh \
--image=${{ env.DS_IMAGE }} \
--hostname=ds.example.com \
--password=Secret.123 \
--network=example \
--network-alias=ds.example.com \
ds
Expand All @@ -57,36 +60,32 @@ jobs:
- name: Install packages
run: |
docker exec ds dnf install -y 389-ds-base
docker cp /tmp/RPMS/. pki:/root/RPMS/
docker exec pki bash -c "dnf localinstall -y /root/RPMS/*"
- name: Install DS
run: docker exec ds ${SHARED}/tests/bin/ds-create.sh

- name: Install CA
run: |
docker exec pki pkispawn \
-f /usr/share/pki/server/examples/installation/ca.cfg \
-s CA \
-D pki_ds_url=ldap://ds.example.com:389 \
-D pki_ds_url=ldap://ds.example.com:3389 \
-v
- name: Install TKS
run: |
docker exec pki pkispawn \
-f /usr/share/pki/server/examples/installation/tks.cfg \
-s TKS \
-D pki_ds_url=ldap://ds.example.com:389 \
-D pki_ds_url=ldap://ds.example.com:3389 \
-v
- name: Install TPS
run: |
docker exec pki pkispawn \
-f /usr/share/pki/server/examples/installation/tps.cfg \
-s TPS \
-D pki_ds_url=ldap://ds.example.com:389 \
-D pki_authdb_url=ldap://ds.example.com:389 \
-D pki_ds_url=ldap://ds.example.com:3389 \
-D pki_authdb_url=ldap://ds.example.com:3389 \
-v
- name: Check TPS admin
Expand All @@ -108,12 +107,12 @@ jobs:
run: |
# import sample TPS users
docker exec pki ldapadd \
-H ldap://ds.example.com:389 \
-H ldap://ds.example.com:3389 \
-D "cn=Directory Manager" \
-w Secret.123 \
-f /usr/share/pki/tps/auth/ds/create.ldif
docker exec pki ldapadd \
-H ldap://ds.example.com:389 \
-H ldap://ds.example.com:3389 \
-D "cn=Directory Manager" \
-w Secret.123 \
-f /usr/share/pki/tps/auth/ds/example.ldif
Expand Down Expand Up @@ -182,6 +181,11 @@ jobs:
run: |
docker exec ds journalctl -x --no-pager -u [email protected]
- name: Check DS container logs
if: always()
run: |
docker logs ds
- name: Check PKI server systemd journal
if: always()
run: |
Expand Down
Loading

0 comments on commit 27530d9

Please sign in to comment.