Add default value for pkidestroy -i option

.github/workflows/acme-basic-test.yml

@@ -571,7 +571,7 @@ jobs:
           docker exec pki pki-server acme-remove
 
       - name: Remove CA from PKI container
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/acme-postgresql-test.yml

@@ -544,7 +544,7 @@ jobs:
           docker exec pki pki-server acme-remove
 
       - name: Remove CA from PKI container
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/acme-switchover-test.yml

@@ -174,7 +174,7 @@ jobs:
           docker exec pki pki-server acme-remove
 
       - name: Remove CA from PKI container
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-admin-user-test.yml

@@ -222,7 +222,7 @@ jobs:
           docker exec pki pki -n caadmin ca-user-find
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-basic-test.yml

@@ -352,7 +352,7 @@ jobs:
           docker exec pki pki -n caadmin ca-profile-show caCustomUser
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server base dir after removal
         run: |

.github/workflows/ca-cert-revocation-test.yml

@@ -185,7 +185,7 @@ jobs:
           docker exec pki /usr/share/pki/tests/ca/bin/ca-agent-cert-unrevoke.sh
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-clone-hsm-test.yml

@@ -430,13 +430,13 @@ jobs:
           diff expected actual
 
       - name: Remove CA from tertiary PKI container
-        run: docker exec tertiary pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec tertiary pkidestroy -s CA -v
 
       - name: Remove CA from secondary PKI container
-        run: docker exec secondary pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec secondary pkidestroy -s CA -v
 
       - name: Remove CA from primary PKI container
-        run: docker exec primary pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec primary pkidestroy -s CA -v
 
       - name: Gather artifacts
         if: always()

.github/workflows/ca-clone-replicated-ds-test.yml

@@ -453,10 +453,10 @@ jobs:
           diff sd.primary sd.secondary
 
       - name: Remove CA from secondary PKI container
-        run: docker exec secondary pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec secondary pkidestroy -s CA -v
 
       - name: Remove CA from primary PKI container
-        run: docker exec primary pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec primary pkidestroy -s CA -v
 
       - name: Gather artifacts
         if: always()

.github/workflows/ca-clone-secure-ds-test.yml

@@ -293,7 +293,7 @@ jobs:
 
       - name: Remove CA from secondary PKI container
         run: |
-          docker exec secondary pkidestroy -i pki-tomcat -s CA -v
+          docker exec secondary pkidestroy -s CA -v
 
       - name: Re-install CA in secondary PKI container
         run: |
@@ -317,13 +317,13 @@ jobs:
         run: |
           docker exec secondary pki -n caadmin ca-user-find
           docker exec secondary pki securitydomain-host-find
-          docker exec secondary pkidestroy -i pki-tomcat -s CA -v
+          docker exec secondary pkidestroy -s CA -v
 
       - name: Remove CA from primary PKI container
         run: |
           docker exec primary pki -n caadmin ca-user-find
           docker exec primary pki securitydomain-host-find
-          docker exec primary pkidestroy -i pki-tomcat -s CA -v
+          docker exec primary pkidestroy -s CA -v
 
       - name: Gather artifacts
         if: always()

.github/workflows/ca-clone-shared-ds-test.yml

@@ -229,13 +229,13 @@ jobs:
         run: |
           docker exec secondary pki -n caadmin ca-user-find
           docker exec secondary pki securitydomain-host-find
-          docker exec secondary pkidestroy -i pki-tomcat -s CA -v
+          docker exec secondary pkidestroy -s CA -v
 
       - name: Remove primary CA
         run: |
           docker exec primary pki -n caadmin ca-user-find
           docker exec primary pki securitydomain-host-find
-          docker exec primary pkidestroy -i pki-tomcat -s CA -v
+          docker exec primary pkidestroy -s CA -v
 
       - name: Gather artifacts
         if: always()

.github/workflows/ca-clone-test.yml

@@ -480,19 +480,19 @@ jobs:
         run: |
           docker exec tertiary pki -n caadmin ca-user-find
           docker exec tertiary pki securitydomain-host-find
-          docker exec tertiary pkidestroy -i pki-tomcat -s CA -v
+          docker exec tertiary pkidestroy -s CA -v
 
       - name: Remove CA from secondary PKI container
         run: |
           docker exec secondary pki -n caadmin ca-user-find
           docker exec secondary pki securitydomain-host-find
-          docker exec secondary pkidestroy -i pki-tomcat -s CA -v
+          docker exec secondary pkidestroy -s CA -v
 
       - name: Remove CA from primary PKI container
         run: |
           docker exec primary pki -n caadmin ca-user-find
           docker exec primary pki securitydomain-host-find
-          docker exec primary pkidestroy -i pki-tomcat -s CA -v
+          docker exec primary pkidestroy -s CA -v
 
       - name: Gather artifacts
         if: always()

.github/workflows/ca-cmc-shared-token-test.yml

@@ -388,7 +388,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-container-migration-test.yml

@@ -93,7 +93,7 @@ jobs:
 
       - name: Remove CA
         run: |
-          docker exec pki pkidestroy -i pki-tomcat -s CA -v
+          docker exec pki pkidestroy -s CA -v
 
       - name: Install Podman
         run: |

.github/workflows/ca-crl-test.yml

@@ -392,7 +392,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-custom-user-test.yml

@@ -96,7 +96,7 @@ jobs:
           docker exec pki pki -n caadmin ca-user-show caadmin
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-ds-connection-test.yml

@@ -161,7 +161,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-ecc-test.yml

@@ -258,7 +258,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-existing-certs-test.yml

@@ -367,7 +367,7 @@ jobs:
           docker exec pki pki -n caadmin ca-cert-request-find
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-existing-config-test.yml

@@ -80,7 +80,7 @@ jobs:
 
       - name: Remove CA
         run: |
-          docker exec pki pkidestroy -i pki-tomcat -s CA -v
+          docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server base dir after first removal
         run: |
@@ -221,7 +221,6 @@ jobs:
       - name: Remove CA again
         run: |
           docker exec pki pkidestroy \
-              -i pki-tomcat \
               -s CA \
               --remove-conf \
               --remove-logs \

.github/workflows/ca-existing-ds-test.yml

@@ -381,7 +381,7 @@ jobs:
           diff expected output
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-existing-hsm-test.yml

@@ -421,7 +421,7 @@ jobs:
           docker exec pki pki -n caadmin ca-cert-request-find
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Remove SoftHSM token
         run: |

.github/workflows/ca-existing-nssdb-test.yml

@@ -312,7 +312,7 @@ jobs:
           docker exec pki pki -n caadmin ca-cert-request-find
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-hsm-operation-test.yml

@@ -113,7 +113,7 @@ jobs:
               -v
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Remove SoftHSM token
         run: |

.github/workflows/ca-hsm-test.yml

@@ -223,7 +223,7 @@ jobs:
           docker exec pki pki -n caadmin ca-user-show caadmin
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Remove SoftHSM token
         run: |

.github/workflows/ca-notification-request-test.yml

@@ -165,7 +165,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-nuxwdog-test.yml

@@ -154,7 +154,7 @@ jobs:
           docker exec pki pki -n caadmin ca-user-show caadmin
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-profile-caDirPinUserCert-test.yml

@@ -302,7 +302,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-profile-caDirUserCert-test.yml

@@ -216,7 +216,7 @@ jobs:
           docker exec pki certutil -L -d /root/.dogtag/nssdb -n json-testuser
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-profile-caServerCert-test.yml

@@ -175,7 +175,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-pruning-test.yml

@@ -431,7 +431,7 @@ jobs:
           diff expected stderr
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-publishing-ca-cert-test.yml

@@ -140,7 +140,7 @@ jobs:
           diff ca_signing.txt output
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-publishing-crl-file-test.yml

@@ -631,7 +631,7 @@ jobs:
           docker exec pki crlutil -D -d /root/.dogtag/nssdb -n ca_signing
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-publishing-crl-ldap-test.yml

@@ -296,7 +296,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-publishing-user-cert-test.yml

@@ -437,7 +437,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-renewal-system-certs-hsm-test.yml

@@ -497,7 +497,7 @@ jobs:
       - name: Remove CA
         run: |
           # pkidestroy should not fail
-          docker exec pki pkidestroy -i pki-tomcat -s CA -v
+          docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-renewal-system-certs-test.yml

@@ -451,7 +451,7 @@ jobs:
       - name: Remove CA
         run: |
           # pkidestroy should not fail
-          docker exec pki pkidestroy -i pki-tomcat -s CA -v
+          docker exec pki pkidestroy -s CA -v
 
       - name: Check PKI server systemd journal
         if: always()

.github/workflows/ca-rsa-pss-test.yml

@@ -267,7 +267,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()

.github/workflows/ca-rsa-test.yml

@@ -266,7 +266,7 @@ jobs:
           diff expected actual
 
       - name: Remove CA
-        run: docker exec pki pkidestroy -i pki-tomcat -s CA -v
+        run: docker exec pki pkidestroy -s CA -v
 
       - name: Check DS server systemd journal
         if: always()