diff --git a/.ci/system-tests/container/pc_setup.sh b/.ci/system-tests/container/pc_setup.sh index 6882cc93b..20de59e56 100755 --- a/.ci/system-tests/container/pc_setup.sh +++ b/.ci/system-tests/container/pc_setup.sh @@ -86,7 +86,7 @@ dnf install -y unzip &> /dev/null # Step 2: Unpack the dmi files. echo "dmi file used was $dmiZip" -unzip -o "$dmiZip" -d $HIRS_CI_TEST_ROOT > /dev/null +unzip -o "$dmiZip" -d $HIRS_CI_TEST_ROOT > /dev/null 2>&1 # Step 3: Copy the platform cert to tcg folder and or upload it to the ACA if [[ ! -d $pcDir ]]; then @@ -103,7 +103,7 @@ pushd $pcDir > /dev/null fi if [ "$UPLOAD_ARTIFACTS" = YES ]; then echo "Uploading $cert to $SERVER_PCERT_POST" - curl -k -F "file=@$cert" $SERVER_PCERT_POST > /dev/null + curl -k -F "file=@$cert" $SERVER_PCERT_POST > /dev/null 2>&1 fi done fi diff --git a/.ci/system-tests/sys_test_common.sh b/.ci/system-tests/sys_test_common.sh index 11c3e6728..d571ab519 100644 --- a/.ci/system-tests/sys_test_common.sh +++ b/.ci/system-tests/sys_test_common.sh @@ -74,11 +74,11 @@ uploadTrustedCerts() { 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" > /dev/null + 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 2>&1 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" > /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 + 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 2>&1 + 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 2>&1 echo "...done" } diff --git a/.ci/system-tests/tests/rim_system_tests.sh b/.ci/system-tests/tests/rim_system_tests.sh index 91cd2fc2d..7ea5bc240 100755 --- a/.ci/system-tests/tests/rim_system_tests.sh +++ b/.ci/system-tests/tests/rim_system_tests.sh @@ -46,7 +46,7 @@ if [ "$test" = "3" ] || [ "$test" = "all" ]; then setPolicyEkPcFw setPlatformCerts -p "laptop" -t "badVarInstall" setRims -p "laptop" -t "badVarInstall" - provisionTpm2 "pass" + provisionTpm2 "fail" fi # Process Test Results, any single failure will send back a failed result.