ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-04-14 14:36:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Edited the way scripts called in docker exec

Browse Source
This commit is contained in:
iadgovuser29 2024-07-10 13:41:31 -04:00
parent 33e91997cb
commit b4edfb0d9a
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.ci/setup/container/tpm2_common.sh
View File

@ -271,7 +271,6 @@ function startFreshTpmServer {
while [[ $# -gt 0 ]]; do
case $1 in
-f|--force|--restart)
echo "Forcing a restart of the TPM server."
stopTpmServer
sleep 5
shift # past argument

2
.ci/system-tests/setup_system_tests.sh
View File

@ -27,7 +27,7 @@ docker exec $tpm2_container sh -c "/tmp/auto_clone_branch $1 > /dev/null 2>&1 \
# Install HIRS Provisioner.Net and setup tpm2 simulator.
# In doing so, tests a single provision between Provisioner.Net and ACA.
echo "Launching provisioner setup"
docker exec $tpm2_container sh /hirs/.ci/setup/container/setup_tpm2provisioner_dotnet.sh
docker exec -i $tpm2_container /bin/bash -c "/hirs/.ci/setup/container/setup_tpm2provisioner_dotnet.sh"
# Initiating System Tests
echo "******** Setup Complete. Beginning HIRS System Tests. ******** "

4
.ci/system-tests/sys_test_common.sh
View File

@ -107,7 +107,7 @@ provisionTpm2() {
}
resetTpmForNewTest() {
docker exec $tpm2_container -it bash -c "source /hirs/.ci/setup/container/tpm2_common.sh; startFreshTpmServer -f; startupTpm; installEkCert"
docker exec -i $tpm2_container /bin/bash -c "source /hirs/.ci/setup/container/tpm2_common.sh; startFreshTpmServer -f; startupTpm; installEkCert"
}
# Places platform cert(s) held in the test folder(s) in the provisioners tcg folder
@ -126,7 +126,7 @@ docker exec $tpm2_container sh /hirs/.ci/system-tests/container/rim_setup.sh $1
setAppsettings() {
OPTIONS=$@
docker exec $tpm2_container -it bash -c "source /hirs/.ci/setup/container/tpm2_common.sh; setCiHirsAppsettingsFile $OPTIONS"
docker exec -i $tpm2_container /bin/bash -c "source /hirs/.ci/setup/container/tpm2_common.sh; setCiHirsAppsettingsFile $OPTIONS"
}
# Writes to the Action ouput, ACA log, and Provisioner Log