From 729c11985aedffd2fbc5422f99edb768cb66f595 Mon Sep 17 00:00:00 2001 From: iadgovuser26 <33069955+iadgovuser26@users.noreply.github.com> Date: Wed, 20 Apr 2022 11:25:30 -0400 Subject: [PATCH] added ACA build output --- .ci/setup/container/setup_aca.sh | 4 +--- .ci/system-tests/run_system_tests.sh | 9 +++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.ci/setup/container/setup_aca.sh b/.ci/setup/container/setup_aca.sh index cf0b1b32..ecce6625 100755 --- a/.ci/setup/container/setup_aca.sh +++ b/.ci/setup/container/setup_aca.sh @@ -11,6 +11,4 @@ if [ ! -d package/rpm/RPMS ]; then ./package/package.centos.sh fi echo "installing the ACA" -yum install -y package/rpm/RPMS/noarch/HIRS_AttestationCA*.el7.noarch.rpm - -echo "ACA Loaded!" \ No newline at end of file +yum install -y package/rpm/RPMS/noarch/HIRS_AttestationCA*.el7.noarch.rpm \ No newline at end of file diff --git a/.ci/system-tests/run_system_tests.sh b/.ci/system-tests/run_system_tests.sh index b136627c..c1b1fe16 100644 --- a/.ci/system-tests/run_system_tests.sh +++ b/.ci/system-tests/run_system_tests.sh @@ -27,12 +27,13 @@ popd > /dev/null pushd .ci/system-tests > /dev/null source sys_test_common.sh +# Build, Package, and Install HIRS ACA (2+ minutes) then wait for systems tests... +docker exec $aca_container sed -i 's/TLSv1,//' /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.*/jre/lib/security/java.security +docker exec $aca_container sed -i 's/TLSv1.1,//' /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.*/jre/lib/security/java.security +docker exec $aca_container /HIRS/.ci/setup/container/setup_aca.sh +echo "ACA Loaded!" echo "ACA Container info: $(checkContainerStatus $aca_container)"; echo "TPM2 Provisioner Container info: $(checkContainerStatus $tpm2_container)"; - -# Build, Package, and Install HIRS ACA (2+ minutes) then wait for systems tests... -docker exec $tpm2_container /HIRS/.ci/setup/container/setup_aca.sh -sleep 120 # Install HIRS provioner and setup tpm2 emulator docker exec $tpm2_container /HIRS/.ci/setup/container/setup_tpm2provisioner.sh