added ACA build output

This commit is contained in:
iadgovuser26 2022-04-20 10:46:26 -04:00
parent 6e0d7a3f6f
commit 29b7857784
4 changed files with 9 additions and 7 deletions

View File

@ -2,12 +2,11 @@ FROM centos:7
# Install packages for installing HIRS ACA
RUN yum -y update && yum clean all
RUN yum install -y mariadb-server openssl java-1.8.0 rpmdevtools coreutils initscripts chkconfig sed grep firewalld policycoreutils && yum clean all
RUN yum install -y mariadb-server openssl tomcat java-1.8.0 rpmdevtools coreutils initscripts chkconfig sed grep wget firewalld policycoreutils net-tools && yum clean all
# Remove TLSv1, TLSv1.1, references to prevent java security from stopping tomcat launch
RUN sed -i 's/TLSv1,//' /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.*/jre/lib/security/java.security
RUN sed -i 's/TLSv1.1,//' /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.*/jre/lib/security/java.security
RUN yum install -y tomcat
# Expose ACA Port
EXPOSE 8443
EXPOSE 8443

View File

@ -9,7 +9,7 @@ services:
ports:
- "${HIRS_ACA_PORTAL_PORT}:${HIRS_ACA_PORTAL_CONTAINER_PORT}"
entrypoint: /bin/bash -c
command: [HIRS/.ci/setup/container/setup_aca.sh]
command: [tail -f /dev/null;]
hostname: ${HIRS_ACA_HOSTNAME}
networks:
hirs_aca_system_tests:

View File

@ -6,11 +6,11 @@ set -e
# Prevent rebuild of packages if they already exist
cd /HIRS
echo "building and packagin the ACA"
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!"
tail -f /dev/null
echo "ACA Loaded!"

View File

@ -30,6 +30,9 @@ source sys_test_common.sh
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