From d92c531cf02c900bf952e654b6b9bb753acfe3b1 Mon Sep 17 00:00:00 2001 From: Roshni Pattath Date: Wed, 3 Dec 2014 22:30:52 -0500 Subject: Changes to Makefile and runtest.sh Included files relating to bug verification --- tests/dogtag/Makefile | 10 ++- tests/dogtag/runtest.sh | 168 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 120 insertions(+), 58 deletions(-) (limited to 'tests') diff --git a/tests/dogtag/Makefile b/tests/dogtag/Makefile index d192c75ae..ba4195014 100755 --- a/tests/dogtag/Makefile +++ b/tests/dogtag/Makefile @@ -224,9 +224,17 @@ build: $(BUILT_FILES) chmod a+x ./acceptance/cli-tests/pki-ca-profile-cli/pki-ca-profile-cli-add.sh chmod a+x ./acceptance/cli-tests/pki-ca-profile-cli/pki-ca-profile-cli-mod.sh # bug verifications - chmod a+x ./acceptance/bugzilla/tomcatjss-bugs.sh + chmod a+x ./acceptance/bugzilla/tomcatjss-bugs/bug-1058366.sh + chmod a+x ./acceptance/bugzilla/tomcatjss-bugs/bug-1084224.sh chmod a+x ./acceptance/bugzilla/pki-core-bugs/giant-debug-log.sh chmod a+x ./acceptance/bugzilla/pki-core-bugs/CSbackup-bug.sh + chmod a+x ./acceptance/bugzilla/bug_setup.sh + chmod a+x ./acceptance/bugzilla/bug_uninstall.sh + chmod a+x ./acceptance/bugzilla/jss-bugs/bug-1133718.sh + chmod a+x ./acceptance/bugzilla/jss-bugs/bug-1040640.sh + chmod a+x ./acceptance/bugzilla/pki-core-bugs/bug-790924.sh + # legacy + chmod a+x ./acceptance/legacy/ca_tests/acls/ca-admin-acl.sh clean: rm -f *~ $(BUILT_FILES) diff --git a/tests/dogtag/runtest.sh b/tests/dogtag/runtest.sh index ab6f2e2c1..80feabed8 100755 --- a/tests/dogtag/runtest.sh +++ b/tests/dogtag/runtest.sh @@ -158,9 +158,16 @@ . ./acceptance/cli-tests/pki-ca-profile-cli/pki-ca-profile-cli-find.sh . ./acceptance/cli-tests/pki-ca-profile-cli/pki-ca-profile-cli-add.sh . ./acceptance/cli-tests/pki-ca-profile-cli/pki-ca-profile-cli-mod.sh -. ./acceptance/bugzilla/tomcatjss-bugs.sh +. ./acceptance/bugzilla/bug_setup.sh +. ./acceptance/bugzilla/bug_uninstall.sh +. ./acceptance/bugzilla/tomcatjss-bugs/bug-1058366.sh +. ./acceptance/bugzilla/tomcatjss-bugs/bug-1084224.sh . ./acceptance/bugzilla/pki-core-bugs/giant-debug-log.sh . ./acceptance/bugzilla/pki-core-bugs/CSbackup-bug.sh +. ./acceptance/bugzilla/jss-bugs/bug-1133718.sh +. ./acceptance/bugzilla/jss-bugs/bug-1040640.sh +. ./acceptance/bugzilla/pki-core-bugs/bug-790924.sh +. ./acceptance/legacy/ca_tests/acls/ca-admin-acl.sh # Make sure TESTORDER is initialized or multihost may have issues TESTORDER=1 @@ -366,11 +373,12 @@ rlJournalStart # Execute pki user-add-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-user-cli-user-mod-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-user-cli-user-cert-add-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-user-cli-user-cert-find-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-user-cli-user-cert-show-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-user-cli-user-cert-delete-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-user-cli-user-mod-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-user-cli-user-cert-add-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-user-cli-user-cert-find-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-user-cli-user-cert-show-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-user-cli-user-cert-delete-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi USER_MOD_KRA_UPPERCASE=$(echo $USER_MOD_KRA | tr [a-z] [A-Z]) @@ -378,35 +386,40 @@ rlJournalStart # Execute pki user-mod-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-user-cli-user-mod-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-user-cli-user-mod-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi USER_CERT_ADD_KRA_UPPERCASE=$(echo $USER_CERT_ADD_KRA | tr [a-z] [A-Z]) if [ "$USER_CERT_ADD_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki user-cert-add-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-user-cli-user-cert-add-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-user-cli-user-cert-add-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi USER_CERT_FIND_KRA_UPPERCASE=$(echo $USER_CERT_FIND_KRA | tr [a-z] [A-Z]) if [ "$USER_CERT_FIND_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki user-cert-find-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-user-cli-user-cert-find-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-user-cli-user-cert-find-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi USER_CERT_SHOW_KRA_UPPERCASE=$(echo $USER_CERT_SHOW_KRA | tr [a-z] [A-Z]) if [ "$USER_CERT_SHOW_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki user-cert-show-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-user-cli-user-cert-show-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-user-cli-user-cert-show-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi USER_CERT_DEL_KRA_UPPERCASE=$(echo $USER_CERT_DEL_KRA | tr [a-z] [A-Z]) if [ "$USER_CERT_DEL_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki user-cert-del-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-user-cli-user-cert-delete-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-user-cli-user-cert-delete-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi ######## PKI CA_USER TESTS ############ PKI_CA_USER_UPPERCASE=$(echo $PKI_CA_USER | tr [a-z] [A-Z]) @@ -773,76 +786,88 @@ rlJournalStart #Execute pki group tests for kra subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-add-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-group-cli-group-show-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-group-cli-group-find-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-group-cli-group-mod-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-group-cli-group-del-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-group-cli-group-member-add-kra_tests $subsystemId $subsystemType $MYROLE - run_pki-group-cli-group-member-find-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-add-kra_tests $subsystemId $subsystemType $MYROLE $caId + run_pki-group-cli-group-show-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-group-cli-group-find-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-group-cli-group-mod-kra_tests $subsystemId $subsystemType $MYROLE $caId + run_pki-group-cli-group-del-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-group-cli-group-member-add-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-group-cli-group-member-find-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-group-cli-group-member-show-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-group-cli-group-member-del-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi GROUP_ADD_KRA_UPPERCASE=$(echo $GROUP_ADD_KRA | tr [a-z] [A-Z]) if [ "$GROUP_ADD_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-add-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-add-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-add-kra_tests $subsystemId $subsystemType $MYROLE $caId fi GROUP_SHOW_KRA_UPPERCASE=$(echo $GROUP_SHOW_KRA | tr [a-z] [A-Z]) if [ "$GROUP_SHOW_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-show-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-show-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-show-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi GROUP_FIND_KRA_UPPERCASE=$(echo $GROUP_FIND_KRA | tr [a-z] [A-Z]) if [ "$GROUP_FIND_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-find-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-find-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-find-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi GROUP_MOD_KRA_UPPERCASE=$(echo $GROUP_MOD_KRA | tr [a-z] [A-Z]) if [ "$GROUP_MOD_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-mod-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-mod-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-mod-kra_tests $subsystemId $subsystemType $MYROLE $caId fi GROUP_DEL_KRA_UPPERCASE=$(echo $GROUP_DEL_KRA | tr [a-z] [A-Z]) if [ "$GROUP_DEL_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-del-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-del-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-del-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi GROUP_MEMBER_ADD_KRA_UPPERCASE=$(echo $GROUP_MEMBER_ADD_KRA | tr [a-z] [A-Z]) if [ "$GROUP_MEMBER_ADD_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-member-add-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-member-add-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-member-add-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi GROUP_MEMBER_FIND_KRA_UPPERCASE=$(echo $GROUP_MEMBER_FIND_KRA | tr [a-z] [A-Z]) if [ "$GROUP_MEMBER_FIND_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-member-find-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-member-find-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-member-find-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi GROUP_MEMBER_DEL_KRA_UPPERCASE=$(echo $GROUP_MEMBER_DEL_KRA | tr [a-z] [A-Z]) if [ "$GROUP_MEMBER_DEL_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-member-del-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-member-del-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-member-del-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi GROUP_MEMBER_SHOW_KRA_UPPERCASE=$(echo $GROUP_MEMBER_SHOW_KRA | tr [a-z] [A-Z]) if [ "$GROUP_MEMBER_SHOW_KRA_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki group-member-show-kra tests subsystemId=$KRA_INST subsystemType=kra - run_pki-group-cli-group-member-show-kra_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-group-cli-group-member-show-kra_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi ######## PKI CA GROUP TESTS ############ PKI_CA_GROUP_TEST_UPPERCASE=$(echo $PKI_CA_GROUP_TEST | tr [a-z] [A-Z]) @@ -937,10 +962,23 @@ rlJournalStart ######## PKI BUG VERIFICATIONS ############ BUG_VERIFICATION_UPPERCASE=$(echo $BUG_VERIFICATION | tr [a-z] [A-Z]) if [ "$BUG_VERIFICATION_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then - #Execute pki bigInt tests + #Execute bug verification + run_bug_verification_setup run_CS-backup-bug-verification run_pki-core-bug-verification run_tomcatjss-bug-verification + run_bug-1058366-verification + run_bug-1133718-verification + run_bug-1040640-verification + run_bug-uninstall + run_bug_790924 + fi + + LEGACY_CA_ADMIN_ACL_UPPERCASE=$(echo $LEGACY_CA_ADMIN_ACL | tr [a-z] [A-Z]) + if [ "$LEGACY_CA_ADMIN_ACL_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then + #Execute legacy CA admin acl tests + subsystemType=ca + run_admin-ca-acl_tests $subsystemType $MYROLE fi ######## PKI KEY KRA TESTS ############ @@ -1138,47 +1176,53 @@ rlJournalStart # Execute pki kra-user tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-user-cli-kra-user-mod_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-user-cli-user-cert-add_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-user-cli-kra-user-cert-find_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-user-cli-kra-user-cert-show_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-user-cli-kra-user-cert-delete_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-user-cli-kra-user-mod_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-user-cli-user-cert-add_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-user-cli-kra-user-cert-find_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-user-cli-kra-user-cert-show_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-user-cli-kra-user-cert-delete_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_USER_MOD_UPPERCASE=$(echo $KRA_USER_MOD | tr [a-z] [A-Z]) if [ "$KRA_USER_MOD_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-user-mod tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-user-cli-kra-user-mod_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-user-cli-kra-user-mod_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_USER_CERT_ADD_UPPERCASE=$(echo $KRA_USER_CERT_ADD | tr [a-z] [A-Z]) if [ "$KRA_USER_CERT_ADD_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki ca-user-cert-add tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-user-cli-user-cert-add_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-user-cert $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-user-cli-user-cert-add_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-user-cert $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_USER_CERT_FIND_UPPERCASE=$(echo $KRA_USER_CERT_FIND | tr [a-z] [A-Z]) if [ "$KRA_USER_CERT_FIND_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-user-cert-find tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-user-cli-kra-user-cert-find_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-user-cli-kra-user-cert-find_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_USER_CERT_SHOW_UPPERCASE=$(echo $KRA_USER_CERT_SHOW | tr [a-z] [A-Z]) if [ "$KRA_USER_CERT_SHOW_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-user-cert-show tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-user-cli-kra-user-cert-show_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-user-cli-kra-user-cert-show_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_USER_CERT_DEL_UPPERCASE=$(echo $KRA_USER_CERT_DEL | tr [a-z] [A-Z]) if [ "$KRA_USER_CERT_DEL_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-user-cert-del tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-user-cli-kra-user-cert-delete_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-user-cli-kra-user-cert-delete_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi ######## PKI KRA GROUP TESTS ############ @@ -1186,16 +1230,17 @@ rlJournalStart if [ "$PKI_KRA_GROUP_TEST_UPPERCASE" = "TRUE" ] ; then #Execute pki kra-group tests subsystemId=$KRA_INST + caId=$CA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-add_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-group-cli-kra-group-mod_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-group-cli-kra-group-find_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-group-cli-kra-group-show_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-group-cli-kra-group-del_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-group-cli-kra-group-member-add_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-group-cli-kra-group-member-show_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-group-cli-kra-group-member-find_tests $subsystemId $subsystemType $MYROLE - run_pki-kra-group-cli-kra-group-member-del_tests $subsystemId $subsystemType $MYROLE + run_pki-kra-group-cli-kra-group-add_tests $subsystemId $subsystemType $MYROLE $caId + run_pki-kra-group-cli-kra-group-mod_tests $subsystemId $subsystemType $MYROLE $caId + run_pki-kra-group-cli-kra-group-find_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-group-cli-kra-group-show_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-group-cli-kra-group-del_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-group-cli-kra-group-member-add_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-group-cli-kra-group-member-show_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-group-cli-kra-group-member-find_tests $subsystemId $subsystemType $MYROLE $caId $MASTER + run_pki-kra-group-cli-kra-group-member-del_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_GROUP_ADD_UPPERCASE=$(echo $KRA_GROUP_ADD | tr [a-z] [A-Z]) @@ -1203,63 +1248,72 @@ rlJournalStart # Execute pki kra-group-add tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-add_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-group-cli-kra-group-add_tests $subsystemId $subsystemType $MYROLE $caId fi KRA_GROUP_MOD_UPPERCASE=$(echo $KRA_GROUP_MOD | tr [a-z] [A-Z]) if [ "$KRA_GROUP_MOD_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-group-mod tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-mod_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-group-cli-kra-group-mod_tests $subsystemId $subsystemType $MYROLE $caId fi KRA_GROUP_FIND_UPPERCASE=$(echo $KRA_GROUP_FIND | tr [a-z] [A-Z]) if [ "$KRA_GROUP_FIND_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-group-find tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-find_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-group-cli-kra-group-find_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_GROUP_SHOW_UPPERCASE=$(echo $KRA_GROUP_SHOW | tr [a-z] [A-Z]) if [ "$KRA_GROUP_SHOW_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-group-show tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-show_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-group-cli-kra-group-show_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_GROUP_DEL_UPPERCASE=$(echo $KRA_GROUP_DEL | tr [a-z] [A-Z]) if [ "$KRA_GROUP_DEL_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-group-del tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-del_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-group-cli-kra-group-del_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_GROUP_MEMBER_ADD_UPPERCASE=$(echo $KRA_GROUP_MEMBER_ADD | tr [a-z] [A-Z]) if [ "$KRA_GROUP_MEMBER_ADD_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-group-member-add tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-member-add_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-group-cli-kra-group-member-add_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_GROUP_MEMBER_SHOW_UPPERCASE=$(echo $KRA_GROUP_MEMBER_SHOW | tr [a-z] [A-Z]) if [ "$KRA_GROUP_MEMBER_SHOW_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-group-member-show tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-member-show_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-group-cli-kra-group-member-show_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_GROUP_MEMBER_FIND_UPPERCASE=$(echo $KRA_GROUP_MEMBER_FIND | tr [a-z] [A-Z]) if [ "$KRA_GROUP_MEMBER_FIND_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-group-member-find tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-member-find_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-group-cli-kra-group-member-find_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi KRA_GROUP_MEMBER_DEL_UPPERCASE=$(echo $KRA_GROUP_MEMBER_DEL | tr [a-z] [A-Z]) if [ "$KRA_GROUP_MEMBER_DEL_UPPERCASE" = "TRUE" ] || [ "$TEST_ALL_UPPERCASE" = "TRUE" ] ; then # Execute pki kra-group-member-del tests subsystemId=$KRA_INST subsystemType=kra - run_pki-kra-group-cli-kra-group-member-del_tests $subsystemId $subsystemType $MYROLE + caId=$CA_INST + run_pki-kra-group-cli-kra-group-member-del_tests $subsystemId $subsystemType $MYROLE $caId $MASTER fi ##CA Profile Tests CA_PROFILE_CONFIG_UPPERCASE=$(echo $CA_PROFILE_CONFIG | tr [a-z] [A-Z]) -- cgit