mirror of
https://github.com/nsacyber/HIRS.git
synced 2024-12-20 05:28:22 +00:00
Test reporting update complete
This commit is contained in:
parent
577880c2f5
commit
726dfe04b5
@ -86,7 +86,7 @@ dnf install -y unzip &> /dev/null
|
|||||||
|
|
||||||
# Step 2: Unpack the dmi files.
|
# Step 2: Unpack the dmi files.
|
||||||
echo "dmi file used was $dmiZip"
|
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
|
# Step 3: Copy the platform cert to tcg folder and or upload it to the ACA
|
||||||
if [[ ! -d $pcDir ]]; then
|
if [[ ! -d $pcDir ]]; then
|
||||||
@ -103,7 +103,7 @@ pushd $pcDir > /dev/null
|
|||||||
fi
|
fi
|
||||||
if [ "$UPLOAD_ARTIFACTS" = YES ]; then
|
if [ "$UPLOAD_ARTIFACTS" = YES ]; then
|
||||||
echo "Uploading $cert to $SERVER_PCERT_POST"
|
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
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -74,11 +74,11 @@ uploadTrustedCerts() {
|
|||||||
echo "...done"
|
echo "...done"
|
||||||
# Upload Trusted Certs from HIRS
|
# Upload Trusted Certs from HIRS
|
||||||
echo "Uploading the Platform Certificate CA(s)..."
|
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 "...done"
|
||||||
echo "Uploading the RIM CA(s)..."
|
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/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
|
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"
|
echo "...done"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ if [ "$test" = "3" ] || [ "$test" = "all" ]; then
|
|||||||
setPolicyEkPcFw
|
setPolicyEkPcFw
|
||||||
setPlatformCerts -p "laptop" -t "badVarInstall"
|
setPlatformCerts -p "laptop" -t "badVarInstall"
|
||||||
setRims -p "laptop" -t "badVarInstall"
|
setRims -p "laptop" -t "badVarInstall"
|
||||||
provisionTpm2 "pass"
|
provisionTpm2 "fail"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Process Test Results, any single failure will send back a failed result.
|
# Process Test Results, any single failure will send back a failed result.
|
||||||
|
Loading…
Reference in New Issue
Block a user