From 4a19bd01ceae2aeccbe30235a7260a518c6ed432 Mon Sep 17 00:00:00 2001
From: iadgovuser26 <33069955+iadgovuser26@users.noreply.github.com>
Date: Mon, 11 Apr 2022 16:43:29 -0400
Subject: [PATCH] GitHub package test

---
 .ci/docker/Dockerfile.tpm2provisioner     | 4 +++-
 .ci/docker/docker-compose-system-test.yml | 4 ++--
 .ci/setup/container/tpm2_common.sh        | 7 +------
 .github/workflows/system_test.yml         | 3 ++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.ci/docker/Dockerfile.tpm2provisioner b/.ci/docker/Dockerfile.tpm2provisioner
index a528a13d..46bcb5bd 100644
--- a/.ci/docker/Dockerfile.tpm2provisioner
+++ b/.ci/docker/Dockerfile.tpm2provisioner
@@ -8,5 +8,7 @@ RUN yum install -y tpm2-tools libcurl procps-ng wget dbus python-requests python
 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
 
 # Install Software TPM for Provisioning
-RUN mkdir ibmtpm && pushd ibmtpm && wget https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm1332.tar.gz && tar -zxvf ibmtpm1332.tar.gz && cd src && make -j5 && popd
+RUN mkdir ibmtpm && pushd ibmtpm && wget --no-check-certificate https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm1332.tar.gz && tar -zxvf ibmtpm1332.tar.gz && cd src && make -j5 && popd
 
+# Install TSS for TPM setup
+RUN mkdir ibmtss && pushd ibmtss && wget --no-check-certificate https://downloads.sourceforge.net/project/ibmtpm20tss/ibmtss1.6.0.tar.gz && tar -zxvf ibmtss1.6.0.tar.gz && cd utils && make -f makefiletpmc && popd
diff --git a/.ci/docker/docker-compose-system-test.yml b/.ci/docker/docker-compose-system-test.yml
index 0417cd41..03903d50 100644
--- a/.ci/docker/docker-compose-system-test.yml
+++ b/.ci/docker/docker-compose-system-test.yml
@@ -2,7 +2,7 @@ version: "3.1"
 
 services:
    aca:
-      image: hirs/hirs-ci:aca
+      image: ghcr.io/nsacyber/hirs/aca:latest
       container_name: hirs-aca1
       volumes:
          - ../../:/HIRS
@@ -18,7 +18,7 @@ services:
               - ${HIRS_ACA_HOSTNAME}
 
    tpmprovisioner:
-      image: hirs/hirs-ci:tpm2provisioner
+      image: ghcr.io/nsacyber/hirs/tpm2provisioner:latest
       container_name: hirs-provisioner1-tpm2
       depends_on:
          - aca
diff --git a/.ci/setup/container/tpm2_common.sh b/.ci/setup/container/tpm2_common.sh
index ed08ed25..36ccf72c 100755
--- a/.ci/setup/container/tpm2_common.sh
+++ b/.ci/setup/container/tpm2_common.sh
@@ -18,14 +18,9 @@ function installProvisioner {
 
 # use ibm tss to properly clear tpm pcr values
 function setTpmPcrValues {
-  mkdir /ibmtss
   pushd /ibmtss  > /dev/null
-    echo "Installing IBM TSS to set the TPM simulator intial values correctly..."
-    wget --no-check-certificate https://downloads.sourceforge.net/project/ibmtpm20tss/ibmtss1.6.0.tar.gz > /dev/null
-    tar -zxvf ibmtss1.6.0.tar.gz > /dev/null
+    echo "starting IBM TSS to set the TPM simulator intial values correctly..."
     cd utils
-    make -f makefiletpmc > /dev/null
-    cd ../utils
     ./startup
   popd  > /dev/null
 }
diff --git a/.github/workflows/system_test.yml b/.github/workflows/system_test.yml
index 940a1e11..fc9499e4 100644
--- a/.github/workflows/system_test.yml
+++ b/.github/workflows/system_test.yml
@@ -19,6 +19,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
         java-version: '8'
         distribution: 'adopt'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
@@ -43,4 +44,4 @@ jobs:
           exit 0;
         else
           exit 1;
-        fi
\ No newline at end of file
+        fi