updated workflow for use with github packages

.ci/docker/Dockerfile.aca

@@ -2,11 +2,17 @@ FROM centos:7
 
 # Install packages for installing HIRS ACA
 RUN yum -y update && 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
+# install build tools for TPM2 provisioner
+RUN yum install -y epel-release cmake make git gcc-c++ doxygen graphviz protobuf-compiler cppcheck python libssh2-devel openssl libcurl-devel log4cplus-devel protobuf-devel re2-devel tpm2-tss-devel tpm2-abrmd-devel  && yum clean all
+
+# install build tools for ACA
+RUN yum install -y sudo yum install java-1.8.0-openjdk-devel protobuf-compiler rpm-build epel-release cmake make git gcc-c++ doxygen graphviz cppcheck python libssh2-devel openssl libcurl-devel log4cplus-devel protobuf-devel re2-devel tpm2-tss-devel tpm2-abrmd-devel trousers-devel && yum clean all
+# install run time dependencies
+RUN yum install -y mariadb-server openssl tomcat java-1.8.0-openjdk-headless rpmdevtools coreutils initscripts chkconfig sed grep wget which firewalld policycoreutils net-tools git  rpm-build && 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 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
 
 # Expose ACA Port
 EXPOSE 8443

.ci/docker/Dockerfile.tpm2provisioner

@@ -1,9 +1,14 @@
-FROM hirs/hirs-ci:centos7
+ROM hirs/hirs-ci:centos7
 
 # Install packages for installing HIRS TPM2 Provisioner
 RUN yum -y update && yum clean all
-RUN yum install -y tpm2-tools libcurl procps-ng wget dbus python-requests python2-future python36-future && yum clean all
 
+# install build dependencies
+RUN yum install -y epel-release cmake make git gcc-c++ doxygen graphviz protobuf-compiler cppcheck python libssh2-devel openssl libcurl-devel log4cplus-devel protobuf-devel re2-devel tpm2-tss-devel tpm2-abrmd-devel && yum clean all
+
+# install run time dependencies 
+RUN yum install -y java-1.8.0 wget util-linux chkconfig sed initscripts coreutils dmidecode trousers tpm-tools && yum clean all
+ 
 # Install PACCOR for Device Info Gathering
 RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.1.4r2/paccor-1.1.4-2.noarch.rpm && yum -y install paccor-*.rpm && popd
 

.ci/setup/container/setup_aca.sh

@@ -6,9 +6,22 @@ set -e
 
 # Prevent rebuild of packages if they already exist
 cd /HIRS
-echo "building and packagin the ACA"
+echo "Building and packaging the ACA"
 if [ ! -d package/rpm/RPMS ]; then
-    ./package/package.centos.sh
+     mkdir -p /HIRS/logs/aca/
+     sh package/package.centos.sh &> /HIRS/logs/aca/aca_build.log
 fi
-echo "installing the ACA"
-yum install -y package/rpm/RPMS/noarch/HIRS_AttestationCA*.el7.noarch.rpm
+echo "Building and packaging the ACA completed"
+echo "Installing the ACA"
+yum install -y package/rpm/RPMS/noarch/HIRS_AttestationCA*.el7.noarch.rpm &> /HIRS/logs/aca/aca_install.log
+filename=package/rpm/RPMS/noarch/HIRS_AttestationCA*.el7.noarch.rpm
+echo "================================================================================"
+echo "Installing:"
+echo "       HIRS_AttestationCA"
+echo "                   $filename" 
+echo ""
+echo "Transaction Summary"
+echo "================================================================================"
+echo "Install  1 Package"
+echo ""
+echo "********************* End of ACA installation *********************"m

.ci/system-tests/run_system_tests.sh

@@ -28,14 +28,14 @@ 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
+docker exec $aca_container sh -c "/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)";
+
 # Install HIRS provioner and setup tpm2 emulator
 docker exec $tpm2_container /HIRS/.ci/setup/container/setup_tpm2provisioner.sh
+echo "TPM2 Provisioner Container info: $(checkContainerStatus $tpm2_container)";
 
 # ********* Execute system tests here, add tests as needed ************* 
 echo "******** Setup Complete Begin HIRS System Tests ******** "

.github/workflows/system_test.yml

@@ -16,19 +16,15 @@ jobs:
       packages: write
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file  
     - name: ACA TPM2 Tests
       continue-on-error: true
       shell: bash
       run: |
         sudo apt-get install -y curl
+        export JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0*/jre/bin"
         echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
+        # comment out the line above and uncomment the line below to run in a forked repo.
+        #echo "${{ secrets.PKG_PWD }}" | docker login ghcr.io -u $ --password-stdin
         bash .ci/system-tests/run_system_tests.sh
     - name: Archive System Test Log files
       uses: actions/upload-artifact@v2