Skip to content

Commit

Permalink
Test reporting update complete
Browse files Browse the repository at this point in the history
  • Loading branch information
iadgovuser26 committed Jul 25, 2024
1 parent 577880c commit 726dfe0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .ci/system-tests/container/pc_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .ci/system-tests/sys_test_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
2 changes: 1 addition & 1 deletion .ci/system-tests/tests/rim_system_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 726dfe0

Please sign in to comment.