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

Merge pull request #368 from nsacyber/issue-367

Browse Source 
Docker Pull update for Travis ci
This commit is contained in:
iadgovuser26 2021-05-28 08:25:12 -04:00 committed by GitHub
commit 9d640348d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.travis.yml
View File

@ -33,27 +33,38 @@ cache:
install: true
script:
- echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin
- docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:centos7 /bin/bash -c "cd /HIRS; ./gradlew :$SUBPROJECT:build -x test :$TCG_RIM_TOOL:build"
jobs:
include:
- stage: Packaging and System Tests
script: docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:ubuntu18 /bin/bash -c "cd /HIRS; ./package/package.ubuntu.sh"
script:
- echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin
- docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:ubuntu18 /bin/bash -c "cd /HIRS; ./package/package.ubuntu.sh"
env: null
name: "Package Ubuntu"
- stage: Packaging and System Tests
script: .ci/system-tests/./run-system-tests.sh
script:
- echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin
- .ci/system-tests/./run-system-tests.sh
env: null
name: "System Tests TPM 1.2"
- stage: Packaging and System Tests
script: .ci/system-tests/./run-system-tests-tpm2.sh
script:
- echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin
- .ci/system-tests/./run-system-tests-tpm2.sh
env: null
name: "System Tests TPM 2.0"
- stage: Packaging and System Tests
script: .ci/system-tests/./run-system-tests-tpm2-base-delta-bad.sh
script:
- echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin
- .ci/system-tests/./run-system-tests-tpm2-base-delta-bad.sh
env: null
name: "System Tests TPM 2.0 Base/Delta(Bad)"
- stage: Packaging and System Tests
script: .ci/system-tests/./run-system-tests-tpm2-base-delta-good.sh
script:
- echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin
- .ci/system-tests/./run-system-tests-tpm2-base-delta-good.sh
env: null
name: "System Tests TPM 2.0 Base/Delta(Good)"

4
HIRS_ProvisionerTPM2/src/CommandTpm2.cpp
View File

@ -816,10 +816,10 @@ string CommandTpm2::runTpm2CommandWithRetry(const string& command,
try {
if (command.compare(kTpm2ToolsNvReadCommand) == 0) {
return hirs::utils::Process::runData(command, args,
"CommandTpm2.cpp", sourceCodeLineNumber);
"CommandTpm2.cpp", sourceCodeLineNumber);
} else {
return hirs::utils::Process::run(command, args,
"CommandTpm2.cpp", sourceCodeLineNumber);
"CommandTpm2.cpp", sourceCodeLineNumber);
}
} catch (HirsRuntimeException& ex) {
tpmErrorCode = Tpm2ToolsOutputParser::parseTpmErrorCode(ex.what());