From 6df75c594c6d75b9c4f17b00cd4c9efa5e03a50f Mon Sep 17 00:00:00 2001 From: "iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil" Date: Thu, 25 Jul 2024 13:49:09 -0400 Subject: [PATCH] Testing failure condition --- .ci/system-tests/sys_test_common.sh | 8 ++++---- .ci/system-tests/tests/aca_policy_tests.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/system-tests/sys_test_common.sh b/.ci/system-tests/sys_test_common.sh index a7604fba..11c3e672 100644 --- a/.ci/system-tests/sys_test_common.sh +++ b/.ci/system-tests/sys_test_common.sh @@ -70,15 +70,15 @@ uploadTrustedCerts() { # Upload CA Cert from IBMTSS Tools echo "Uploading Trust Certificates to ${HIRS_ACA_HOSTNAME}:${HIRS_ACA_PORTAL_PORT}" echo "Uploading the EK Certificate CA(s)..." - docker exec -i $tpm2_container /bin/bash -c "curl -k -F 'file=@/ibmtss/utils/certificates/cacert.pem' $SERVER_CACERT_POST" + docker exec -i $tpm2_container /bin/bash -c "curl -k -F 'file=@/ibmtss/utils/certificates/cacert.pem' $SERVER_CACERT_POST" > /dev/null echo "...done" # Upload Trusted Certs from HIRS echo "Uploading the Platform Certificate CA(s)..." - docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/ca.crt' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" + docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/ca.crt' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null echo "...done" echo "Uploading the RIM CA(s)..." - docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RIMCaCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" - docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RimSignCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" + docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RIMCaCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null + docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RimSignCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null echo "...done" } diff --git a/.ci/system-tests/tests/aca_policy_tests.sh b/.ci/system-tests/tests/aca_policy_tests.sh index 3a6a838f..653e2493 100755 --- a/.ci/system-tests/tests/aca_policy_tests.sh +++ b/.ci/system-tests/tests/aca_policy_tests.sh @@ -102,7 +102,7 @@ if [ "$test" = "10" ] || [ "$test" = "all" ]; then uploadTrustedCerts setPlatformCerts -p "laptop" -t "default" setRims -p "laptop" -t "default" -u -n - provisionTpm2 "pass" + provisionTpm2 "fail" fi # Process Test Results, any single failure will send back a failed result.