diff options
22 files changed, 197 insertions, 246 deletions
diff --git a/.gitignore b/.gitignore index 4b66852c5..d3b7a61be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .metadata/ build/ +tests/dogtag/dev_java_tests/bin/ diff --git a/scripts/compose_functions b/scripts/compose_functions index 49ca67f48..9271a0bc0 100644 --- a/scripts/compose_functions +++ b/scripts/compose_functions @@ -242,17 +242,8 @@ Fetch_Source_Tarball() ### # Create repository using the details in the config file ### # Function parameters - $1 - repository file path. -# Sample repository file : -# ### Location where the files have to be copied ### -# ### Same parameter for both local and remote ### -# REPOSITORY_LOCATION=/var/www/html/pki/ -# -# ### Remote host details### -# REMOTE_HOSTNAME_OR_IP=vm-051.idm.lab.bos.redhat.com -# USERNAME=root -# PASSWORD=******** ### -# + Create_repo_after_build() { if [ $# -eq 0 ]; then @@ -269,7 +260,7 @@ Create_repo_after_build() ### Remove leading and trailing whitespaces ### repo_location=`echo $REPOSITORY_LOCATION |sed -e 's/^ *//g' -e 's/ *$//g'` - destination=`echo $REMOTE_HOSTNAME_OR_IP|sed -e 's/^ *//g' -e 's/ *$//g'` + destination=`echo $REPOSITORY_HOST|sed -e 's/^ *//g' -e 's/ *$//g'` uname=`echo $USERNAME |sed -e 's/^ *//g' -e 's/ *$//g'` pwd=`echo $PASSWORD |sed -e 's/^ *//g' -e 's/ *$//g'` @@ -277,9 +268,7 @@ Create_repo_after_build() if [ "$destination" != "" ] ; then createrepo ./RPMS/noarch/ createrepo ./RPMS/x86_64/ - createrepo ./SOURCES/ createrepo ./SRPMS/ - createrepo ./SPECS/ if [ $uname == "" ] ; then echo "No username provided in the configuration file." echo "Enter the username:" @@ -294,8 +283,6 @@ Create_repo_after_build() echo $url ./scp_the_repo.exp "RPMS/" $url $PASSWORD ./scp_the_repo.exp "SRPMS/" $url $PASSWORD - ./scp_the_repo.exp "SOURCES/" $url $PASSWORD - ./scp_the_repo.exp "SPECS/" $url $PASSWORD if [ $? -ne 0 ]; then echo "Cannot copy the repositories to $destination\n" exit -1 @@ -309,9 +296,7 @@ Create_repo_after_build() cp -r RPMS SOURCES SRPMS SPECS $repo_location createrepo $REPOSITORY_LOCATION/RPMS/noarch/ createrepo $REPOSITORY_LOCATION/RPMS/x86_64/ - createrepo $REPOSITORY_LOCATION/SOURCES/ createrepo $REPOSITORY_LOCATION/SRPMS/ - createrepo $REPOSITORY_LOCATION/SPECS/ echo "Build repository created at $repo_location." exit 0 fi diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package index eca169f6b..705cd9859 100755 --- a/scripts/compose_pki_test_package +++ b/scripts/compose_pki_test_package @@ -45,7 +45,7 @@ COMPOSE_DIR=`dirname $0 | cd ; pwd` PKI_SOURCE_DIR=`cd $COMPOSE_DIR/..; pwd` ### Build the task rpm outside the PKI git source tree. -### The rhts-build-package command checks if the code is is a git repository, +### The rhts-mk-build-package command checks if the code is is a git repository, ### if yes, it will compare tags of the current branch and the master branch. ### If they do not match then the rpm is not built. diff --git a/scripts/conf/repository.cfg b/scripts/conf/repository.cfg new file mode 100644 index 000000000..fba586c69 --- /dev/null +++ b/scripts/conf/repository.cfg @@ -0,0 +1,8 @@ +### Location where the files have to be copied ### +### Same parameter for both local and remote ### +REPOSITORY_LOCATION=/var/www/html/pki + +### Remote host details### +REPOSITORY_HOST= +USERNAME= +PASSWORD= diff --git a/README_FOR_TESTS b/tests/dogtag/README index a8a7784f3..c9679bea0 100644 --- a/README_FOR_TESTS +++ b/tests/dogtag/README @@ -11,26 +11,56 @@ 1.1.1. Setting up the test environment. - The test environment has to be setup using the deploment configuration - file tests/dogtag/dev_java_tests/deploy.cfg (the -f option for - pkispawn). + A new DS instance, to be used by the CA instance for + which the tests are run, can be created by running the following + command: - If there are any changes to the values in this file, they must also be - updated in tests/dogtag/dev_java_tests/test.cfg. (Used by the tests) - The files, when used as they are, will run the tests successfully. + setup-ds.pl --silent --\ + General.FullMachineName=$HOSTNAME\ + General.SuiteSpotUserID=dirsrv\ + General.SuiteSpotGroup=dirsrv\ + slapd.ServerPort=389\ + slapd.ServerIdentifier=pki-tomcat\ + slapd.Suffix=dc=example,dc=com\ + slapd.RootDN="cn=Directory Manager"\ + slapd.RootDNPwd=Secret123 - **Note- The test environment has to be setup before running the tests. - The tests do not setup the environment. - **Note- The details of the nssdb holding the ca_admin_cert.p12 has to be - updated in the test.cfg for running the tests. + Then a CA instance can be created using the deploment configuration + file tests/dogtag/conf/deploy.cfg with the command: + + pkispawn -s CA -f deploy.cfg + + The ca_admin_cert.p12 file has to be imported into an NSS DB to be used + for authentication in the tests. + + Since pkispawn can only be run as root user, the ca_admin_cert.p12 + file is created in /root/.dogtag/pki-tomcat/. The root user can run + the following commands to make it available to a non-root user. + + cp ~/.dogtag/pki-tomcat/ca_admin_cert.p12 /tmp + chmod 777 /tmp/ca_admin_cert.p12 + + Now the following commands can be executed to import the cert PKCS12 + file into a local NSS DB. + + mkdir /tmp/nssdb + certutil -N -d /tmp/nssdb + ** When prompted for a password, enter Secret123 + pk12util -i /tmp/ca_admin_cert.p12 -d /tmp/nssdb + ** Enter "Secret123" as password for both the NSSDB and the p12 file. + + Any the changes during the initial setup have to be updated in the + tests/dogtag/conf/test.cfg. (Used by the tests) + With all the setting above mentioned the tests will run successfully. 1.1.2. Running the tests - The tests can be either run individually or as as part of a suite. + The tests can be either run individually or as as part of a suite + in Eclipse. To run the tests as a suite, Open BeakerTestSuite and run as JUnit test. A suite is a test runner which executes all the tests added to it - using the $SuiteClasses tag. + using the @SuiteClasses tag. A customized suite, PKITestSuite, is used to provide additional functionality when the tests are run on a beaker test machine. @@ -45,73 +75,60 @@ The following steps help setup a beaker client for creating the task rpm and submitting the beaker job to the beaker server. - -- Create a repo file in /etc/yum.repos.d, ex. beaker-client.repo, with - the following content. - - [beaker-client] - name=Beaker Client - Fedora<version> - baseurl=http://beaker-project.org/yum/client/Fedora<version> - enabled=1 - gpgcheck=0 - - [beaker-client-testing] - name=Beaker Client - Fedora<version> Testing - baseurl=http://beaker-project.org/yum/client-testing/Fedora<version> - enabled=0 - gpgheck=0 + -- Copy the file tests/dogtag/conf/beaker-client.repo to + /etc/yum.repos.d and replace <version> with the version of fedora. + (run this command for fedora version: cat /etc/fedora-release) - -- Install the packages(yum): expect, beakerlib, beaker-client, rhts-devel + -- Do: yum install expect beakerlib beaker-client rhts-devel - -- Create a file /etc/beaker/client.conf (if not already present the - packages are installed) and paste this content. + -- Create a folder /etc/beaker and copy the file + tests/dogtag/conf/client.conf to that folder. Update the client.conf + file with the beaker server's authentication details. - # Base URL of the Beaker server (without trailing slash!) - HUB_URL = "<BEAKER_SERVER_URL>" - # Hub authentication method - AUTH_METHOD = "krbv" - #AUTH_METHOD = "password" + For an Username/Password authentication enter values + for HUB_URL, USERNAME, PASSWORD. The sample file has been configured + for using this setting as default. - # Username and password - USERNAME = "example" - #PASSWORD = "" + For a Kerberos authentication, comment the AUTH_METHOD="password", + USERNAME and PASSWORD fields uncomment and enter the values for + HUB_URL and KRB_REALM and uncomment the line AUTH_METHOD="krbv". - # Kerberos principal. If commented, default principal obtained by kinit is used. - #KRB_PRINCIPAL = "host/$HOSTNAME" - - # Kerberos keytab file. - #KRB_KEYTAB = "/etc/krb5.keytab" + This sets up the machine as a beaker client, on which new task rpms can + be built and new jobs submitted to the beaker server. + A beaker job is an XML file. The template used to create a job is in + tests/dogtag/beakerjob.dogtag.xml.template. - # Kerberos service prefix. Example: host, HTTP - #KRB_SERVICE = "HTTP" + 1.2.2 Building the beaker task rpm and submitting a beaker job. - # Kerberos realm. If commented, last two parts of domain name are used. Example: MYDOMAIN.COM. - KRB_REALM = "" + 1.2.2.1 Creating a repository of the built rpms. - # Kerberos credential cache file. - #KRB_CCACHE = "" + Use --createrepo option in the compose scripts to create a repository + of the rpms built, like: - Provide the details as per the authentication protocol used by the - server: Username/Password or a Kerberos login. + ./compose_pki_core_packages --createrepo=conf/repository.cfg hybrid_rpms - This sets up the machine as a beaker client, on which new task rpms can - be built and new jobs submitted to the beaker server. - A beaker job is an XML file. The template used to create a job is in - tests/beaker/rhcs/beakerjob.rhcs.xml.template. + This command builds the rpms, copies them to the REPOSITORY_LOCATION specified in the file + and creates it as a repository. + If the location specified is hosted on a httpd server, this repository + URL can be in the job xml. - 1.2.2 Building the beaker task rpm and submitting a beaker job. + If a remote host name is provided then the repos are scp'ed at the + location provided on the remote host using the credentials provided. + (If no login credentials are provided, then a prompt appears asking + for them.) - ** Building the task rpm and submitting the job to a beaker server is done + 1.2.2.2 Building the task rpm and submitting the job to a beaker server is done by executing the compose script in pki/scripts: - ./compose_pki_test_package User-ID_for_personalization Job_xml_config_file [--runtests] + ./compose_pki_test_package unique_identifier beaker_job_config [--runtests] The builds are done in <pki_source_root>/../package.tests/ folder. - -- The user id is for personalizing the rpm. + -- The unique_identifier is for personalizing the rpm. This path at which the test source is extracted from the rpm on the beaker server is specified by the TEST variable in the - Makefile (pki/tests/beaker/rhcs/Makefile). + Makefile (pki/tests/dogtag/Makefile). So another rpm with the same to-be-extracted path overwrites the existing test code. @@ -119,23 +136,15 @@ to provide a unique to-be-extracted path for every test rpm of dogtag tests (especially at a user level). - -- Job_xml_configuration_file (the absolute path of the file from /) + -- beaker_job_config (the absolute path of the file from /) - to configure the recipe of a job. - The contents of the file should be: + A sample configuration file is at tests/conf/beaker-job.cfg. - [DEFAULT] - repos=http://<REPO_HOST_NAME>/pki/F20/RPMS/noarch - http://<REPO_HOST_NAME>/pki/F20/RPMS/x86_64 - hostname= - distro_family=Fedora20 - distro_name=Fedora-20-Alpha - distro_arch=x86_64 - - The repos parameter should the URL's for accessing the dogtag rpms. - The hostname means the hostname of a specific beaker test machine. - The distro_* are the details of the distribution on the beaker - server, that has to be installed on the test machine. + The repos parameter should point to the URL's to access the dogtag + rpms. The hostname means the hostname of a specific beaker test + machine. The distro_* are the details of the distribution on the + beaker server, that has to be installed on the test machine. -- The optional --runtests option. Without the --runtests options the task rpm and the job xml are @@ -150,37 +159,16 @@ But specifying --wait-on-beaker-job option, the process is blocked until the job is completed. - ** Creating a repository of the built rpms. - - A --createrepo option has been added to be used by the build compose - scripts. For example: - ./compose_pki_core_packages --createrepo=<repository_location_details> hybrid_rpms - - builds the rpms, copied them to the location specified in the file - passed as the value to the option and creates it as a repository. - If the location specified is hosted on a httpd server, this repository - URL can be in the job xml. The file should contain the following: - - ### Location where the files have to be copied ### - ### Same parameter for both local and remote ### - REPOSITORY_LOCATION=/var/www/html/pki - - ### Remote host details### - REMOTE_HOSTNAME_OR_IP= - USERNAME= - PASSWORD= - - If a remote host name is provided then the repos are scp'ed at the - location provided on the remote host using the credentials provided. - (If no login credentials are provided, then a prompt appears asking - for them.) **Note- In the case of creating a repository on a remote machine, the remote machine must be a known_host to the local machine. 2. Setting up a Jenkins server for continuous integration testing + -- Follow the steps in section 1.2.1 to setup a beaker-client on the + system. + -- Install Jenkins. (It is better to configure the Jenkins server to use a port other than 8080) diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh index 617895587..4552973af 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-add-ca.sh @@ -587,7 +587,7 @@ run_pki-user-cli-user-add-ca_tests(){ -n CA_adminV \ -c $nss_db_password \ -t ca \ - group-add-member Administrators $user > $TmpDir/pki-user-add-ca-007_1.out" \ + group-member-add Administrators $user > $TmpDir/pki-user-add-ca-007_1.out" \ 0 \ "Add user $user to Administrators group" @@ -598,14 +598,14 @@ run_pki-user-cli-user-add-ca_tests(){ -n CA_adminV \ -c $nss_db_password \ -t ca \ - group-find-member Administrators > $TmpDir/pki-user-add-ca-007.out" \ + group-member-find Administrators > $TmpDir/pki-user-add-ca-007.out" \ 0 \ - "Show pki group-find-member Administrators" + "Show pki group-member-find Administrators" rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ -t ca \ - group-add-member \"Certificate Manager Agents\" $user > $TmpDir/pki-user-add-ca-007_1_1.out" \ + group-member-add \"Certificate Manager Agents\" $user > $TmpDir/pki-user-add-ca-007_1_1.out" \ 0 \ "Add user $user to Administrators group" @@ -616,9 +616,9 @@ run_pki-user-cli-user-add-ca_tests(){ -n CA_adminV \ -c $nss_db_password \ -t ca \ - group-find-member \"Certificate Manager Agents\" > $TmpDir/pki-user-add-ca-007_2.out" \ + group-member-find \"Certificate Manager Agents\" > $TmpDir/pki-user-add-ca-007_2.out" \ 0 \ - "Show pki group-find-member Administrators" + "Show pki group-member-find Administrators" rlAssertGrep "User: $user" "$TmpDir/pki-user-add-ca-007_2.out" rlPhaseEnd @@ -717,7 +717,7 @@ run_pki-user-cli-user-add-ca_tests(){ user-add --fullName=\"$user1fullname\" $user1 > $TmpDir/pki-user-add-ca-adminE-002.out 2>&1" \ 1 \ "Cannot add user $user1 using a agent cert" - rlAssertGrep "RuntimeException: java.io.IOException: SocketException cannot read on socket" "$TmpDir/pki-user-add-ca-adminE-002.out" + rlAssertGrep "ResteasyIOException: IOException" "$TmpDir/pki-user-add-ca-adminE-002.out" rlRun "date --set='2 days ago'" 0 "Set System back to the present day" rlPhaseEnd @@ -735,7 +735,7 @@ run_pki-user-cli-user-add-ca_tests(){ user-add --fullName=\"$user1fullname\" $user1 > $TmpDir/pki-user-add-ca-agentE-002.out 2>&1" \ 1 \ "Cannot add user $user1 using a agent cert" - rlAssertGrep "RuntimeException: java.io.IOException: SocketException cannot read on socket" "$TmpDir/pki-user-add-ca-agentE-002.out" + rlAssertGrep "ResteasyIOException: IOException" "$TmpDir/pki-user-add-ca-agentE-002.out" rlRun "date --set='2 days ago'" 0 "Set System back to the present day" rlPhaseEnd @@ -785,7 +785,7 @@ run_pki-user-cli-user-add-ca_tests(){ user-add --fullName=\"$user1fullname\" $user1 > $TmpDir/pki-user-add-ca-adminUTCA-002.out 2>&1" \ 1 \ "Cannot add user $user1 using a untrusted cert" - rlAssertGrep "ClientResponseFailure: Error status 401 Unauthorized returned" "$TmpDir/pki-user-add-ca-adminUTCA-002.out" + rlAssertGrep "ResteasyIOException: IOException" "$TmpDir/pki-user-add-ca-adminUTCA-002.out" rlPhaseEnd rlPhaseStartTest "pki_user_cli_user_add-CA-0014: Cannot add user using a CA_agentUTCA" @@ -800,14 +800,14 @@ run_pki-user-cli-user-add-ca_tests(){ user-add --fullName=\"$user1fullname\" $user1 > $TmpDir/pki-user-add-ca-agentUTCA-002.out 2>&1" \ 1 \ "Cannot add user $user1 using a untrusted cert" - rlAssertGrep "RuntimeException: java.net.SocketException: Object not found: org.mozilla.jss.crypto.ObjectNotFoundException" "$TmpDir/pki-user-add-ca-agentUTCA-002.out" + rlAssertGrep "ResteasyIOException: IOException" "$TmpDir/pki-user-add-ca-agentUTCA-002.out" rlPhaseEnd rlPhaseStartTest "pki_user_cli_user_cleanup-001_15: Deleting the temp directory and users" del_user=($CA_adminV_user $CA_adminR_user $CA_adminE_user $CA_adminUTCA_user $CA_agentV_user $CA_agentR_user $CA_agentE_user $CA_agentUTCA_user $CA_auditV_user $CA_operatorV_user) #===Deleting users created using CA_adminV cert===# i=1 - while [ $i -lt 25] ; do + while [ $i -lt 25 ] ; do rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-ca.sh index 8f3a82d7d..62a81b23a 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-ca.sh @@ -124,7 +124,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - group-add-member Administrators $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ + group-member-add Administrators $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ 0 \ "Add user $userid to Administrators group" rlAssertGrep "Added group member \"$userid\"" "$TmpDir/pki-user-add-ca-group001$i.out" @@ -134,7 +134,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - group-add-member \"Certificate Manager Agents\" $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ + group-member-add \"Certificate Manager Agents\" $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ 0 \ "Add user $userid to Certificate Manager Agents group" rlAssertGrep "Added group member \"$userid\"" "$TmpDir/pki-user-add-ca-group001$i.out" @@ -145,7 +145,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - group-add-member Auditors $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ + group-member-add Auditors $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ 0 \ "Add user $userid to Auditors group" rlAssertGrep "Added group member \"$userid\"" "$TmpDir/pki-user-add-ca-group001$i.out" @@ -156,7 +156,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - group-add-member \"Trusted Managers\" $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ + group-member-add \"Trusted Managers\" $userid > $TmpDir/pki-user-add-ca-group001$i.out" \ 0 \ "Add user $userid to Trusted Managers group" rlAssertGrep "Added group member \"$userid\"" "$TmpDir/pki-user-add-ca-group001$i.out" @@ -180,17 +180,17 @@ run_pki-user-cli-user-ca_tests(){ rlRun "sed -e '/-----BEGIN NEW CERTIFICATE REQUEST-----/d' -i /tmp/requestdb/request_001$i.out" rlRun "sed -e '/-----END NEW CERTIFICATE REQUEST-----/d' -i /tmp/requestdb/request_001$i.out" rlRun "dos2unix /tmp/requestdb/request_001$i.out" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='cert_request_type']/value\" -v 'pkcs10' $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='cert_request']/value\" -v \"$(cat -v /tmp/requestdb/request_001$i.out)\" $temp_file" 0 "adding certificate request" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_uid']/value\" -v $userid $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_e']/value\" -v $userid@example.com $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_cn']/value\" -v $userfullName $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_ou']/value\" -v Engineering $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_o']/value\" -v Example $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='sn_c']/value\" -v US $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='requestor_name']/value\" -v $userid $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='requestor_email']/value\" -v $userid@example.com $temp_file" - rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/attribute[@name='requestor_phone']/value\" -v 123-456-7890 $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='cert_request_type']/Value\" -v 'pkcs10' $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='cert_request']/Value\" -v \"$(cat -v /tmp/requestdb/request_001$i.out)\" $temp_file" 0 "adding certificate request" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_uid']/Value\" -v $userid $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_e']/Value\" -v $userid@example.com $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_cn']/Value\" -v $userfullName $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_ou']/Value\" -v Engineering $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_o']/Value\" -v Example $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='sn_c']/Value\" -v US $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='requestor_name']/Value\" -v $userid $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='requestor_email']/Value\" -v $userid@example.com $temp_file" + rlRun "xmlstarlet ed -L -u \"CertEnrollmentRequest/Input/Attribute[@name='requestor_phone']/Value\" -v 123-456-7890 $temp_file" if [ $userid == $CA_adminV_user -o $userid == $CA_adminR_user -o $userid == $CA_agentV_user -o $userid == $CA_agentR_user -o $userid == $CA_auditV_user -o $userid == $CA_operatorV_user ]; then #cert-request-submit===== @@ -241,7 +241,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - user-add-cert $userid --input /tmp/requestdb/validcert_001$i.pem > /tmp/requestdb/useraddcert__001$i.out" \ + user-cert-add $userid --input /tmp/requestdb/validcert_001$i.pem > /tmp/requestdb/useraddcert__001$i.out" \ 0 \ "Cert is added to the user $userid" @@ -308,7 +308,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - user-add-cert $userid --input /tmp/requestdb/validcert_001$i.pem > /tmp/requestdb/useraddcert__001$i.out" \ + user-cert-add $userid --input /tmp/requestdb/validcert_001$i.pem > /tmp/requestdb/useraddcert__001$i.out" \ 0 \ "Cert is added to the user $userid" rlLog "Modifying profile back to the defaults" @@ -333,7 +333,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - user-add-cert $userid --input /opt/rhqa_pki/dummycert1.pem > /tmp/requestdb/useraddcert__001$i.out" \ + user-cert-add $userid --input /opt/rhqa_pki/dummycert1.pem > /tmp/requestdb/useraddcert__001$i.out" \ 0 \ "Cert is added to the user $userid" elif [ $userid == $CA_agentUTCA_user ]; then @@ -342,7 +342,7 @@ run_pki-user-cli-user-ca_tests(){ -n \"$admin_cert_nickname\" \ -c $nss_db_password \ -t ca \ - user-add-cert $userid --input /opt/rhqa_pki/dummycert1.pem > /tmp/requestdb/useraddcert__001$i.out" \ + user-cert-add $userid --input /opt/rhqa_pki/dummycert1.pem > /tmp/requestdb/useraddcert__001$i.out" \ 0 \ "Cert is added to the user $userid" #Revoke certificate of user CA_adminR and CA_agentR diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh index b31a96325..bf977106c 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-del-ca.sh @@ -73,6 +73,10 @@ run_pki-user-cli-user-del-ca_tests(){ #===Deleting users created using CA_adminV cert===# i=1 while [ $i -lt 25 ] ; do + rlLog "pki -d /tmp/requestdb \ + -n CA_adminV \ + -c $nss_db_password \ + user-del u$i" rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ @@ -97,10 +101,14 @@ run_pki-user-cli-user-del-ca_tests(){ j=1 while [ $j -lt 8 ] ; do eval usr=\$user$j + rlLog "pki -d /tmp/requestdb \ + -n CA_adminV \ + -c $nss_db_password \ + user-del $usr " rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ - user-del $usr> $TmpDir/pki-user-del-ca-user2-00$j.out" \ + user-del $usr > $TmpDir/pki-user-del-ca-user2-00$j.out" \ 0 \ "Deleted user $usr" rlAssertGrep "Deleted user \"$usr\"" "$TmpDir/pki-user-del-ca-user2-00$j.out" diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh index 5a318a3fd..d52863368 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-find-ca.sh @@ -54,11 +54,11 @@ user7=0 ######################################################################## run_pki-user-cli-user-find-ca_tests(){ - rlPhaseStartSetup "pki_user_cli_user_show-ca-startup:Getting the temp directory and nss certificate db " + rlPhaseStartSetup "pki_user_cli_user_find-ca-startup:Getting the temp directory and nss certificate db " rlLog "nss_db directory = $TmpDir/nssdb" rlLog "temp directory = /tmp/requestdb" rlPhaseEnd - rlPhaseStartSetup "pki_user_cli_user_show-ca-startup-addusers:Add users to test the user-find functionality" + rlPhaseStartSetup "pki_user_cli_user_find-ca-startup-addusers:Add users to test the user-find functionality" i=1 while [ $i -lt 25 ] ; do rlRun "pki -d /tmp/requestdb \ @@ -108,7 +108,7 @@ run_pki-user-cli-user-find-ca_tests(){ user-find --size=$maximum_check > $TmpDir/pki-user-find-ca-003.out 2>&1" \ 0 \ "All users" - rlAssertGrep "Number of entries returned 46" "$TmpDir/pki-user-find-ca-003.out" + rlAssertGrep "Number of entries returned 47" "$TmpDir/pki-user-find-ca-003.out" rlPhaseEnd rlPhaseStartTest "pki_user_cli_user_find-ca-004: Find users, check for negative input --size=-1" @@ -202,7 +202,7 @@ run_pki-user-cli-user-find-ca_tests(){ #===Deleting users created using CA_adminV cert===# i=1 - while [ $i -lt 24] ; do + while [ $i -lt 25 ] ; do rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ diff --git a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh index 34efa4bc0..a52c1d536 100755 --- a/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh +++ b/tests/dogtag/acceptance/cli-tests/pki-user-cli/ca/pki-user-cli-user-show-ca.sh @@ -593,7 +593,7 @@ run_pki-user-cli-user-show-ca_tests(){ #===Deleting users created using CA_adminV cert===# i=1 - while [ $i -lt 24] ; do + while [ $i -lt 24 ] ; do rlRun "pki -d /tmp/requestdb \ -n CA_adminV \ -c $nss_db_password \ diff --git a/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh b/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh index ba751d617..e121debbf 100644 --- a/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh +++ b/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh @@ -97,11 +97,11 @@ rhcs_install_ca() { rlAssertGrep "$exp_message2" "$INSTANCE_CREATE_OUT" exp_message3_1="To check the status of the subsystem:" rlAssertGrep "$exp_message3_1" "$INSTANCE_CREATE_OUT" - exp_message3_2="systemctl status pki-tomcatd\\\@pki-tomcat.service" + exp_message3_2="systemctl status pki-tomcatd\@pki-tomcat.service" rlAssertGrep "$exp_message3_2" "$INSTANCE_CREATE_OUT" exp_message4_1="To restart the subsystem:" rlAssertGrep "$exp_message4_1" "$INSTANCE_CREATE_OUT" - exp_message4_2=" systemctl restart pki-tomcatd\\\@pki-tomcat.service" + exp_message4_2=" systemctl restart pki-tomcatd\@pki-tomcat.service" rlAssertGrep "$exp_message4_2" "$INSTANCE_CREATE_OUT" exp_message5="The URL for the subsystem is:" rlAssertGrep "$exp_message5" "$INSTANCE_CREATE_OUT" @@ -163,11 +163,11 @@ rhcs_install_kra() { rlAssertGrep "$exp_message1" "$INSTANCE_CREATE_OUT" exp_message4="To check the status of the subsystem:" rlAssertGrep "$exp_message4" "$INSTANCE_CREATE_OUT" - exp_message5="systemctl status pki-tomcatd\\\@pki-tomcat.service" + exp_message5="systemctl status pki-tomcatd\@pki-tomcat.service" rlAssertGrep "$exp_message5" "$INSTANCE_CREATE_OUT" exp_message6="To restart the subsystem:" rlAssertGrep "$exp_message6" "$INSTANCE_CREATE_OUT" - exp_message7=" systemctl restart pki-tomcatd\\\@pki-tomcat.service" + exp_message7=" systemctl restart pki-tomcatd\@pki-tomcat.service" rlAssertGrep "$exp_message7" "$INSTANCE_CREATE_OUT" exp_message8="The URL for the subsystem is:" rlAssertGrep "$exp_message8" "$INSTANCE_CREATE_OUT" @@ -228,11 +228,11 @@ rhcs_install_ocsp() { rlAssertGrep "$exp_message1" "$INSTANCE_CREATE_OUT" exp_message3_1="To check the status of the subsystem:" rlAssertGrep "$exp_message3_1" "$INSTANCE_CREATE_OUT" - exp_message3_2="systemctl status pki-tomcatd\\\@pki-tomcat.service" + exp_message3_2="systemctl status pki-tomcatd\@pki-tomcat.service" rlAssertGrep "$exp_message3_2" "$INSTANCE_CREATE_OUT" exp_message4_1="To restart the subsystem:" rlAssertGrep "$exp_message4_1" "$INSTANCE_CREATE_OUT" - exp_message4_2=" systemctl restart pki-tomcatd\\\@pki-tomcat.service" + exp_message4_2=" systemctl restart pki-tomcatd\@pki-tomcat.service" rlAssertGrep "$exp_message4_2" "$INSTANCE_CREATE_OUT" exp_message5="The URL for the subsystem is:" rlAssertGrep "$exp_message5" "$INSTANCE_CREATE_OUT" @@ -293,11 +293,11 @@ rhcs_install_tks() { rlAssertGrep "$exp_message1" "$INSTANCE_CREATE_OUT" exp_message3_1="To check the status of the subsystem:" rlAssertGrep "$exp_message3_1" "$INSTANCE_CREATE_OUT" - exp_message3_2="systemctl status pki-tomcatd\\\@pki-tomcat.service" + exp_message3_2="systemctl status pki-tomcatd\@pki-tomcat.service" rlAssertGrep "$exp_message3_2" "$INSTANCE_CREATE_OUT" exp_message4_1="To restart the subsystem:" rlAssertGrep "$exp_message4_1" "$INSTANCE_CREATE_OUT" - exp_message4_2=" systemctl restart pki-tomcatd\\\@pki-tomcat.service" + exp_message4_2=" systemctl restart pki-tomcatd\@pki-tomcat.service" rlAssertGrep "$exp_message4_2" "$INSTANCE_CREATE_OUT" exp_message5="The URL for the subsystem is:" rlAssertGrep "$exp_message5" "$INSTANCE_CREATE_OUT" diff --git a/tests/dogtag/beakerjob.rhcs.xml.template b/tests/dogtag/beakerjob.dogtag.xml.template index 5ba50d086..9b519d3a3 100644 --- a/tests/dogtag/beakerjob.rhcs.xml.template +++ b/tests/dogtag/beakerjob.dogtag.xml.template @@ -24,7 +24,7 @@ <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/CoreOS/rhcs/PKI_TEST_USER_ID" role="MASTER"> + <task name="/CoreOS/dogtag/PKI_TEST_USER_ID" role="MASTER"> <params> <param name="TEST_ALL" value="TRUE"/> <param name="QUICKINSTALL" value="FALSE"/> diff --git a/tests/dogtag/conf/beaker-client.cfg b/tests/dogtag/conf/beaker-client.cfg new file mode 100644 index 000000000..692e846d3 --- /dev/null +++ b/tests/dogtag/conf/beaker-client.cfg @@ -0,0 +1,11 @@ +[beaker-client] +name=Beaker Client - Fedora<version> +baseurl=http://beaker-project.org/yum/client/Fedora<version> +enabled=1 +gpgcheck=0 + +[beaker-client-testing] +name=Beaker Client - Fedora<version> Testing +baseurl=http://beaker-project.org/yum/client-testing/Fedora<version> +enabled=0 +gpgheck=0 diff --git a/tests/dogtag/conf/beaker-job.cfg b/tests/dogtag/conf/beaker-job.cfg new file mode 100644 index 000000000..a9d97c5f8 --- /dev/null +++ b/tests/dogtag/conf/beaker-job.cfg @@ -0,0 +1,7 @@ +[DEFAULT] +repos=http://<REPO_HOST_NAME>/pki/RPMS/noarch + http://<REPO_HOST_NAME>/pki/RPMS/x86_64 +hostname= +distro_family=Fedora20 +distro_name=Fedora-20-Alpha +distro_arch=x86_64 diff --git a/tests/dogtag/conf/client.conf b/tests/dogtag/conf/client.conf new file mode 100644 index 000000000..d17214fc9 --- /dev/null +++ b/tests/dogtag/conf/client.conf @@ -0,0 +1,24 @@ +# Base URL of the Beaker server (without trailing slash!) +HUB_URL = "<BEAKER_SERVER_URL>" +# Hub authentication method +#AUTH_METHOD = "krbv" +AUTH_METHOD = "password" + +# Username and password +USERNAME = "example" +PASSWORD = "" + +# Kerberos principal. If commented, default principal obtained by kinit is used. +#KRB_PRINCIPAL = "host/$HOSTNAME" + +# Kerberos keytab file. +#KRB_KEYTAB = "/etc/krb5.keytab" + +# Kerberos service prefix. Example: host, HTTP +#KRB_SERVICE = "HTTP" + +# Kerberos realm. If commented, last two parts of domain name are used. Example: MYDOMAIN.COM. +#KRB_REALM = "" + +# Kerberos credential cache file. +#KRB_CCACHE = "" diff --git a/tests/dogtag/dev_java_tests/conf/deploy.cfg b/tests/dogtag/conf/deploy.cfg index e6f1d5449..d2ba552f3 100644 --- a/tests/dogtag/dev_java_tests/conf/deploy.cfg +++ b/tests/dogtag/conf/deploy.cfg @@ -1,6 +1,6 @@ [DEFAULT] pki_client_pkcs12_password=Secret123 -pki_ds_password= +pki_ds_password=Secret123 [CA] pki_admin_name=caadmin diff --git a/tests/dogtag/dev_java_tests/conf/test.cfg b/tests/dogtag/conf/test.cfg index de1e690a2..a88d6e430 100644 --- a/tests/dogtag/dev_java_tests/conf/test.cfg +++ b/tests/dogtag/conf/test.cfg @@ -11,17 +11,16 @@ host=localhost # Provide the details of the nssdb which contains the admin cert. nss_db_dir=/tmp/nssdb -nss_db_password=XXXXXXXX +nss_db_password=Secret123 # pki_admin_nickname admin_cert_nickname=caadmin -# Default location = ~/.dogtag/pki-tomcat/ca_admin_cert.p12 -CA_ADMIN_CERT_LOCATION= # pki_client_pkcs12_password CA_CLIENT_PKCS12_PASSWORD=Secret123 ### Configuration entries used in QE tests. # pki_https_port CA_SECURE_PORT=8443 +CA_ADMIN_CERT_LOCATION= LDAP_ROOTDN= LDAP_ROOTDNPWD= LDAP_BASEDN= diff --git a/tests/dogtag/dev_java_tests/.classpath b/tests/dogtag/dev_java_tests/.classpath deleted file mode 100644 index d40b7a3b1..000000000 --- a/tests/dogtag/dev_java_tests/.classpath +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> - <classpathentry kind="lib" path="/usr/share/java/junit4.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-certsrv.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-ca.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-cms.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-cmsbundle.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-cmscore.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-cmsutil.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-console-theme.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-kra.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-nsutil.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-ocsp.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-silent.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-tks.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-tomcat.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-tools.jar"/> - <classpathentry kind="lib" path="/usr/share/java/pki/pki-tps.jar"/> - <classpathentry kind="lib" path="/usr/share/java/jss/jss4.jar"/> - <classpathentry kind="lib" path="/usr/share/java/httpcomponents/httpclient.jar"/> - <classpathentry kind="lib" path="/usr/share/java/httpcomponents/httpcore.jar"/> - <classpathentry kind="lib" path="/usr/share/java/resteasy/jaxrs-api.jar"/> - <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-atom-provider.jar"/> - <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jaxb-provider.jar"/> - <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jaxrs.jar"/> - <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jaxrs-jandex.jar"/> - <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jettison-provider.jar"/> - <classpathentry kind="lib" path="/usr/share/java/apache-commons-cli.jar"/> - <classpathentry kind="lib" path="/usr/share/java/apache-commons-codec.jar"/> - <classpathentry kind="lib" path="/usr/share/java/apache-commons-logging.jar"/> - <classpathentry kind="lib" path="/usr/share/java/commons-codec.jar"/> - <classpathentry kind="lib" path="/usr/share/java/commons-httpclient.jar"/> - <classpathentry kind="lib" path="/usr/share/java/idm-console-base-1.1.7.jar"/> - <classpathentry kind="lib" path="/usr/share/java/idm-console-mcc.jar"/> - <classpathentry kind="lib" path="/usr/share/java/idm-console-nmclf.jar"/> - <classpathentry kind="lib" path="/usr/share/java/jakarta-commons-httpclient.jar"/> - <classpathentry kind="lib" path="/usr/share/java/jaxb-api.jar"/> - <classpathentry kind="lib" path="/usr/share/java/ldapjdk.jar"/> - <classpathentry kind="lib" path="/usr/share/java/apache-commons-lang.jar"/> - <classpathentry kind="lib" path="/usr/share/java/istack-commons-runtime.jar"/> - <classpathentry kind="lib" path="/usr/share/java/scannotation.jar"/> - <classpathentry kind="lib" path="/usr/share/java/servlet.jar"/> - <classpathentry kind="lib" path="/usr/share/java/velocity.jar"/> - <classpathentry kind="lib" path="/usr/share/java/xerces-j2.jar"/> - <classpathentry kind="lib" path="/usr/share/java/xml-commons-apis.jar"/> - <classpathentry kind="lib" path="/usr/share/java/tomcat/catalina.jar"/> - <classpathentry kind="lib" path="/usr/share/java/tomcat/tomcat-util.jar"/> - <classpathentry kind="lib" path="/usr/share/java/commons-io.jar"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/dogtag/dev_java_tests/.project b/tests/dogtag/dev_java_tests/.project deleted file mode 100644 index 84a4ea49a..000000000 --- a/tests/dogtag/dev_java_tests/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>PKIUnitTests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/dogtag/dev_java_tests/.settings/org.eclipse.jdt.core.prefs b/tests/dogtag/dev_java_tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 7341ab168..000000000 --- a/tests/dogtag/dev_java_tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/tests/dogtag/dev_java_tests/src/com/netscape/beakertests/PKIJUnitTest.java b/tests/dogtag/dev_java_tests/src/com/netscape/beakertests/PKIJUnitTest.java index 0ce46c752..aae090674 100644 --- a/tests/dogtag/dev_java_tests/src/com/netscape/beakertests/PKIJUnitTest.java +++ b/tests/dogtag/dev_java_tests/src/com/netscape/beakertests/PKIJUnitTest.java @@ -30,7 +30,7 @@ public class PKIJUnitTest { if (runWithBeaker == null || (! runWithBeaker.toLowerCase().equals("true"))) { properties = new Properties(); try { - properties.load(new BufferedReader(new FileReader("tests/dogtag/dev_java_tests/conf/test.cfg"))); + properties.load(new BufferedReader(new FileReader("tests/dogtag/conf/test.cfg"))); } catch (IOException e) { e.printStackTrace(); System.err.println("Cannot read the configuration file"); diff --git a/tests/dogtag/make-package.sh b/tests/dogtag/make-package.sh index 0ba0018a5..2e22c6723 100755 --- a/tests/dogtag/make-package.sh +++ b/tests/dogtag/make-package.sh @@ -36,6 +36,6 @@ rm -rf Makefile mv .Makefile.save Makefile -sed -e "s|PKI_TEST_USER_ID|${user_id}|g" beakerjob.rhcs.xml.template >> beakerjob.rhcs.xml +sed -e "s|PKI_TEST_USER_ID|${user_id}|g" beakerjob.dogtag.xml.template >> beakerjob.rhcs.xml python update_beaker_job.py beakerjob.rhcs.xml $2 |