Skip to content
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.

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

Fix clone CA issue on upstream CI #4839

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 19 additions & 6 deletions .github/workflows/ca-clone-secure-ds-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,10 @@ jobs:
docker exec secondary pki-server cert-find
- name: Run PKI healthcheck in primary PKI container
run: docker exec primary pki-healthcheck --failures-only

- name: Run PKI healthcheck in secondary PKI container
run: docker exec secondary pki-healthcheck --failures-only

- name: Rebuild indexes for CA in secondary PKI container
run: |
docker exec secondary pki-server ca-db-index-rebuild
- name: Verify DS connection in secondary PKI container
run: |
docker exec secondary pki-server ca-db-config-show > output
Expand Down Expand Up @@ -267,10 +265,21 @@ jobs:
run: |
docker exec secondary pki -n caadmin ca-cert-request-find
- name: Run PKI healthcheck in primary PKI container
run: docker exec primary pki-healthcheck --failures-only

- name: Run PKI healthcheck in secondary PKI container
run: docker exec secondary pki-healthcheck --failures-only

- name: Remove CA from secondary PKI container
run: |
docker exec secondary pkidestroy -i pki-tomcat -s CA -v
- name: Restart secondary DS container
run: |
tests/bin/ds-stop.sh --image=pki-runner secondaryds
tests/bin/ds-start.sh --image=pki-runner secondaryds
- name: Re-install CA in secondary PKI container
run: |
# create cert bundle containing CA and DS signing certs
Expand All @@ -289,6 +298,10 @@ jobs:
-D pki_ds_url=ldaps://secondaryds.example.com:3636 \
-v
- name: Rebuild indexes for CA in secondary PKI container
run: |
docker exec secondary pki-server ca-db-index-rebuild
- name: Remove CA from secondary PKI container
run: |
docker exec secondary pki -n caadmin ca-user-find
Expand Down
14 changes: 7 additions & 7 deletions base/acme/database/ds/indextask.ldif
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ objectclass: extensibleObject
cn: acme
ttl: 10
nsinstance: userroot
nsIndexAttribute: acmeExpires:eq
nsIndexAttribute: acmeAccountId:eq
nsIndexAttribute: acmeStatus:eq
nsIndexAttribute: acmeAuthorizationId:eq
nsIndexAttribute: acmeIdentifier:eq
nsIndexAttribute: acmeCertificateId:eq
nsIndexAttribute: acmeAuthorizationWildcard:eq,pres
nsIndexAttribute: acmeExpires
nsIndexAttribute: acmeAccountId
nsIndexAttribute: acmeStatus
nsIndexAttribute: acmeAuthorizationId
nsIndexAttribute: acmeIdentifier
nsIndexAttribute: acmeCertificateId
nsIndexAttribute: acmeAuthorizationWildcard
66 changes: 33 additions & 33 deletions base/ca/database/ds/indextasks.ldif
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@ objectclass: extensibleObject
cn: index1160589770
ttl: 10
nsinstance: {database}
nsIndexAttribute: revokedby:eq
nsIndexAttribute: issuedby:eq
nsIndexAttribute: publicKeyData:eq
nsIndexAttribute: clientId:eq
nsIndexAttribute: dataType:eq
nsIndexAttribute: status:eq
nsIndexAttribute: description:eq,pres
nsIndexAttribute: serialno:eq,pres
nsIndexAttribute: metaInfo:eq,pres
nsIndexAttribute: certstatus:eq,pres
nsIndexAttribute: requestid:eq,pres
nsIndexAttribute: requesttype:eq,pres
nsIndexAttribute: requeststate:eq,pres
nsIndexAttribute: requestowner:eq,pres
nsIndexAttribute: notbefore:eq,pres
nsIndexAttribute: notafter:eq,pres
nsIndexAttribute: duration:eq,pres
nsIndexAttribute: dateOfCreate:eq,pres
nsIndexAttribute: revokedOn:eq,pres
nsIndexAttribute: archivedBy:eq,pres
nsIndexAttribute: ownername:eq,pres,sub
nsIndexAttribute: subjectname:eq,pres,sub
nsIndexAttribute: issuername:eq,pres,sub
nsIndexAttribute: requestsourceid:eq,pres,sub
nsIndexAttribute: revInfo:eq,pres,sub
nsIndexAttribute: extension:eq,pres,sub
nsIndexAttribute: acmeExpires:eq
nsIndexAttribute: acmeAccountId:eq
nsIndexAttribute: acmeStatus:eq
nsIndexAttribute: acmeAuthorizationId:eq
nsIndexAttribute: acmeIdentifier:eq
nsIndexAttribute: acmeCertificateId:eq
nsIndexAttribute: acmeAuthorizationWildcard:eq,pres
nsIndexAttribute: revokedby
nsIndexAttribute: issuedby
nsIndexAttribute: publicKeyData
nsIndexAttribute: clientId
nsIndexAttribute: dataType
nsIndexAttribute: status
nsIndexAttribute: description
nsIndexAttribute: serialno
nsIndexAttribute: metaInfo
nsIndexAttribute: certstatus
nsIndexAttribute: requestid
nsIndexAttribute: requesttype
nsIndexAttribute: requeststate
nsIndexAttribute: requestowner
nsIndexAttribute: notbefore
nsIndexAttribute: notafter
nsIndexAttribute: duration
nsIndexAttribute: dateOfCreate
nsIndexAttribute: revokedOn
nsIndexAttribute: archivedBy
nsIndexAttribute: ownername
nsIndexAttribute: subjectname
nsIndexAttribute: issuername
nsIndexAttribute: requestsourceid
nsIndexAttribute: revInfo
nsIndexAttribute: extension
nsIndexAttribute: acmeExpires
nsIndexAttribute: acmeAccountId
nsIndexAttribute: acmeStatus
nsIndexAttribute: acmeAuthorizationId
nsIndexAttribute: acmeIdentifier
nsIndexAttribute: acmeCertificateId
nsIndexAttribute: acmeAuthorizationWildcard
50 changes: 25 additions & 25 deletions base/kra/database/ds/indextasks.ldif
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ objectclass: extensibleObject
cn: index1160589771
ttl: 10
nsinstance: {database}
nsIndexAttribute: revokedby:eq
nsIndexAttribute: issuedby:eq
nsIndexAttribute: publicKeyData:eq
nsIndexAttribute: clientId:eq
nsIndexAttribute: dataType:eq
nsIndexAttribute: status:eq
nsIndexAttribute: description:eq,pres
nsIndexAttribute: serialno:eq,pres
nsIndexAttribute: metaInfo:eq,pres
nsIndexAttribute: certstatus:eq,pres
nsIndexAttribute: requestid:eq,pres
nsIndexAttribute: requesttype:eq,pres
nsIndexAttribute: requeststate:eq,pres
nsIndexAttribute: requestowner:eq,pres
nsIndexAttribute: notbefore:eq,pres
nsIndexAttribute: notafter:eq,pres
nsIndexAttribute: duration:eq,pres
nsIndexAttribute: dateOfCreate:eq,pres
nsIndexAttribute: revokedOn:eq,pres
nsIndexAttribute: archivedBy:eq,pres
nsIndexAttribute: ownername:eq,pres,sub
nsIndexAttribute: subjectname:eq,pres,sub
nsIndexAttribute: requestsourceid:eq,pres,sub
nsIndexAttribute: revInfo:eq,pres,sub
nsIndexAttribute: extension:eq,pres,sub
nsIndexAttribute: revokedby
nsIndexAttribute: issuedby
nsIndexAttribute: publicKeyData
nsIndexAttribute: clientId
nsIndexAttribute: dataType
nsIndexAttribute: status
nsIndexAttribute: description
nsIndexAttribute: serialno
nsIndexAttribute: metaInfo
nsIndexAttribute: certstatus
nsIndexAttribute: requestid
nsIndexAttribute: requesttype
nsIndexAttribute: requeststate
nsIndexAttribute: requestowner
nsIndexAttribute: notbefore
nsIndexAttribute: notafter
nsIndexAttribute: duration
nsIndexAttribute: dateOfCreate
nsIndexAttribute: revokedOn
nsIndexAttribute: archivedBy
nsIndexAttribute: ownername
nsIndexAttribute: subjectname
nsIndexAttribute: requestsourceid
nsIndexAttribute: revInfo
nsIndexAttribute: extension
50 changes: 25 additions & 25 deletions base/ocsp/database/ds/indextasks.ldif
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ objectclass: extensibleObject
cn: index1160589772
ttl: 10
nsinstance: {database}
nsIndexAttribute: revokedby:eq
nsIndexAttribute: issuedby:eq
nsIndexAttribute: publicKeyData:eq
nsIndexAttribute: clientId:eq
nsIndexAttribute: dataType:eq
nsIndexAttribute: status:eq
nsIndexAttribute: description:eq,pres
nsIndexAttribute: serialno:eq,pres
nsIndexAttribute: metaInfo:eq,pres
nsIndexAttribute: certstatus:eq,pres
nsIndexAttribute: requestid:eq,pres
nsIndexAttribute: requesttype:eq,pres
nsIndexAttribute: requeststate:eq,pres
nsIndexAttribute: requestowner:eq,pres
nsIndexAttribute: notbefore:eq,pres
nsIndexAttribute: notafter:eq,pres
nsIndexAttribute: duration:eq,pres
nsIndexAttribute: dateOfCreate:eq,pres
nsIndexAttribute: revokedOn:eq,pres
nsIndexAttribute: archivedBy:eq,pres
nsIndexAttribute: ownername:eq,pres,sub
nsIndexAttribute: subjectname:eq,pres,sub
nsIndexAttribute: requestsourceid:eq,pres,sub
nsIndexAttribute: revInfo:eq,pres,sub
nsIndexAttribute: extension:eq,pres,sub
nsIndexAttribute: revokedby
nsIndexAttribute: issuedby
nsIndexAttribute: publicKeyData
nsIndexAttribute: clientId
nsIndexAttribute: dataType
nsIndexAttribute: status
nsIndexAttribute: description
nsIndexAttribute: serialno
nsIndexAttribute: metaInfo
nsIndexAttribute: certstatus
nsIndexAttribute: requestid
nsIndexAttribute: requesttype
nsIndexAttribute: requeststate
nsIndexAttribute: requestowner
nsIndexAttribute: notbefore
nsIndexAttribute: notafter
nsIndexAttribute: duration
nsIndexAttribute: dateOfCreate
nsIndexAttribute: revokedOn
nsIndexAttribute: archivedBy
nsIndexAttribute: ownername
nsIndexAttribute: subjectname
nsIndexAttribute: requestsourceid
nsIndexAttribute: revInfo
nsIndexAttribute: extension
50 changes: 25 additions & 25 deletions base/tks/database/ds/indextasks.ldif
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ objectclass: extensibleObject
cn: index1160589773
ttl: 10
nsinstance: {database}
nsIndexAttribute: revokedby:eq
nsIndexAttribute: issuedby:eq
nsIndexAttribute: publicKeyData:eq
nsIndexAttribute: clientId:eq
nsIndexAttribute: dataType:eq
nsIndexAttribute: status:eq
nsIndexAttribute: description:eq,pres
nsIndexAttribute: serialno:eq,pres
nsIndexAttribute: metaInfo:eq,pres
nsIndexAttribute: certstatus:eq,pres
nsIndexAttribute: requestid:eq,pres
nsIndexAttribute: requesttype:eq,pres
nsIndexAttribute: requeststate:eq,pres
nsIndexAttribute: requestowner:eq,pres
nsIndexAttribute: notbefore:eq,pres
nsIndexAttribute: notafter:eq,pres
nsIndexAttribute: duration:eq,pres
nsIndexAttribute: dateOfCreate:eq,pres
nsIndexAttribute: revokedOn:eq,pres
nsIndexAttribute: archivedBy:eq,pres
nsIndexAttribute: ownername:eq,pres,sub
nsIndexAttribute: subjectname:eq,pres,sub
nsIndexAttribute: requestsourceid:eq,pres,sub
nsIndexAttribute: revInfo:eq,pres,sub
nsIndexAttribute: extension:eq,pres,sub
nsIndexAttribute: revokedby
nsIndexAttribute: issuedby
nsIndexAttribute: publicKeyData
nsIndexAttribute: clientId
nsIndexAttribute: dataType
nsIndexAttribute: status
nsIndexAttribute: description
nsIndexAttribute: serialno
nsIndexAttribute: metaInfo
nsIndexAttribute: certstatus
nsIndexAttribute: requestid
nsIndexAttribute: requesttype
nsIndexAttribute: requeststate
nsIndexAttribute: requestowner
nsIndexAttribute: notbefore
nsIndexAttribute: notafter
nsIndexAttribute: duration
nsIndexAttribute: dateOfCreate
nsIndexAttribute: revokedOn
nsIndexAttribute: archivedBy
nsIndexAttribute: ownername
nsIndexAttribute: subjectname
nsIndexAttribute: requestsourceid
nsIndexAttribute: revInfo
nsIndexAttribute: extension
16 changes: 8 additions & 8 deletions base/tps/database/ds/indextasks.ldif
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ objectclass: extensibleObject
cn: index1160589774
ttl: 10
nsinstance: {database}
nsIndexAttribute: tokenUserID:eq,pres,sub
nsIndexAttribute: tokenID:eq,pres,sub
nsIndexAttribute: dateOfCreate:eq,pres,sub
nsIndexAttribute: dateOfModify:eq,pres,sub
nsIndexAttribute: userCertificate:eq
nsIndexAttribute: tokenSerial:eq
nsIndexAttribute: tokenKeyType:eq
nsIndexAttribute: description:eq,pres
nsIndexAttribute: tokenUserID
nsIndexAttribute: tokenID
nsIndexAttribute: dateOfCreate
nsIndexAttribute: dateOfModify
nsIndexAttribute: userCertificate
nsIndexAttribute: tokenSerial
nsIndexAttribute: tokenKeyType
nsIndexAttribute: description
Loading