diff --git a/.travis.yml b/.travis.yml index 1a7ea2ed..db1196e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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)" diff --git a/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp b/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp index 4fc2a0f3..2f31e69e 100644 --- a/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp +++ b/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp @@ -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());