Corrections to rebase to PKI 11.0.1

* Fixes rpmlint issues with JVM macro
* Fixes gating issue looking for ds-create.sh
* Fixes incorrect version in changelog

Resolves: #1936636

pki-core.spec

@@ -16,7 +16,7 @@ License:          GPLv2 and LGPLv2
 # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
 # For official (i.e. supported) releases, use x.y.z-r where r >=1.
 Version:          11.0.1
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
+Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -alpha1
 
 # To create a tarball from a version tag:
@@ -1369,7 +1369,7 @@ fi
 
 ################################################################################
 %changelog
-* Tue Nov 23 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.0.0-1
+* Tue Nov 23 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.0.1-2
 - Rebase to PKI 11.0.1
 
 * Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 11.0.0-1

tests/roles/Test_Setup/tasks/main.yml

@@ -6,7 +6,27 @@
       389-ds-base, pki-ca, pki-kra, pki-tests
 
 - name: Setup DS Service
-  shell: /usr/share/pki/tests/bin/ds-create.sh
+  shell: |
+    dscreate create-template ds.inf
+
+    sed -i \
+        -e "s/;instance_name = .*/instance_name = localhost/g" \
+        -e "s/;root_password = .*/root_password = Secret.123/g" \
+        -e "s/;suffix = .*/suffix = dc=example,dc=com/g" \
+        -e "s/;self_sign_cert = .*/self_sign_cert = False/g" \
+        ds.inf
+
+    dscreate from-file ds.inf
+
+    ldapadd -h $HOSTNAME -x -D "cn=Directory Manager" -w Secret.123 << EOF
+    dn: dc=example,dc=com
+    objectClass: domain
+    dc: example
+
+    dn: dc=pki,dc=example,dc=com
+    objectClass: domain
+    dc: pki
+    EOF
 
 - name: Install CA subsystem
   shell: pkispawn -f /usr/share/pki/server/examples/installation/ca.cfg -s CA -v

tests/tests.yml

@@ -8,10 +8,10 @@
     tests:
     - verify_spawn_ca:
         dir: .
-        run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep '<Status>running</Status>'"
+        run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep '\"Status\" : \"running\"'"
     - verify_spawn_kra:
         dir: .
-        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '<Status>running</Status>'"
+        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '\"Status\" : \"running\"'"
     - destroy_kra:
         dir: .
         run: "pkidestroy -i pki-tomcat -s KRA && sleep 5"