From 89e1aea09163590d3f8285728b8916f95555cff2 Mon Sep 17 00:00:00 2001
From: "iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil"
 <iadgovuser26@empire.eclipse.ncsc.mil>
Date: Thu, 25 Jul 2024 13:33:16 -0400
Subject: [PATCH 1/7] Added check for non typical provisioner status

---
 .ci/system-tests/run_system_tests.sh          | 11 ----
 .ci/system-tests/sys_test_common.sh           | 17 +++---
 .ci/system-tests/tests/platform_cert_tests.sh |  1 -
 .ci/system-tests/tests/rim_system_tests.sh    |  1 -
 .github/workflows/system_test.yml             | 55 ++++++-------------
 5 files changed, 28 insertions(+), 57 deletions(-)

diff --git a/.ci/system-tests/run_system_tests.sh b/.ci/system-tests/run_system_tests.sh
index ba6d523d..36ae2a56 100755
--- a/.ci/system-tests/run_system_tests.sh
+++ b/.ci/system-tests/run_system_tests.sh
@@ -6,7 +6,6 @@
 #    1. Uncomment the "cd ../.." line below to make working directory = /HIRS/
 #    2. Run with the desired HIRS branch as an argument (i.e. $./run_system_tests.sh main)
 ##########################################################################################
-#cd ../..
 
 # Setting variables
 aca_container=hirs-aca1
@@ -49,13 +48,3 @@ docker exec $tpm2_container sh -c "mkdir -p /HIRS/logs/provisioner/ && cp -ap hi
 echo "*** Exiting and removing Docker containers and network ..."
 docker compose -f ./.ci/docker/docker-compose-system-test.yml down -v
 
-# Return container exit code
-if [[ ${TEST_STATUS} == "0" ]]; then
-    echo "******** SUCCESS: System Tests for TPM 2.0 passed ********"
-    echo "TEST_STATUS=0" >> $GITHUB_ENV
-    exit 0;
-  else
-    echo "******** FAILURE: System Tests for TPM 2.0 failed ********"
-    echo "TEST_STATUS=1" >> $GITHUB_ENV
-    exit 1
-fi
diff --git a/.ci/system-tests/sys_test_common.sh b/.ci/system-tests/sys_test_common.sh
index 444b925d..a7604fba 100644
--- a/.ci/system-tests/sys_test_common.sh
+++ b/.ci/system-tests/sys_test_common.sh
@@ -99,13 +99,16 @@ provisionTpm2() {
      else
         echo "Provisioning failed as expected."
      fi
-  else   # provisioning succeeded
-     if [[ $expected_result == "fail" ]]; then
-       ((failedTests++))
-       echo "!!! Provisioning passed, but was expected to fail"
-     else
-        echo "Provisioning passed as expected."
-     fi
+  elif [[ $provisionOutput == *"Provisioning successful"* ]]; then
+       if [[ $expected_result == "fail" ]]; then
+          ((failedTests++))
+         echo "!!! Provisioning passed, but was expected to fail."
+       else
+         echo "Provisioning passed as expected."
+       fi
+  else   # Unexpected output
+     ((failedTests++))
+       echo "Provisioning failed. Provisioner provided an unexpected output."
   fi
 }
 
diff --git a/.ci/system-tests/tests/platform_cert_tests.sh b/.ci/system-tests/tests/platform_cert_tests.sh
index 7ceadae9..5c01cd33 100755
--- a/.ci/system-tests/tests/platform_cert_tests.sh
+++ b/.ci/system-tests/tests/platform_cert_tests.sh
@@ -48,7 +48,6 @@ fi
 
 #  Process Test Results, any single failure will send back a failed result.
 if [[ $failedTests != 0 ]]; then
-    export TEST_STATUS=1
     echo "****  $failedTests out of $totalTests Platform Certificate Tests Failed! ****"
     exit 1
   else
diff --git a/.ci/system-tests/tests/rim_system_tests.sh b/.ci/system-tests/tests/rim_system_tests.sh
index 91093943..7ea5bc24 100755
--- a/.ci/system-tests/tests/rim_system_tests.sh
+++ b/.ci/system-tests/tests/rim_system_tests.sh
@@ -51,7 +51,6 @@ fi
 
 #  Process Test Results, any single failure will send back a failed result.
 if [[ $failedTests != 0 ]]; then
-    export TEST_STATUS=1
     echo "****  $failedTests out of $totalTests ACA RIM Tests Failed! ****"
     exit 1
   else
diff --git a/.github/workflows/system_test.yml b/.github/workflows/system_test.yml
index d0c0082a..a5be1268 100644
--- a/.github/workflows/system_test.yml
+++ b/.github/workflows/system_test.yml
@@ -8,8 +8,6 @@ on:
       - '*v3*'
       - 'main'
   workflow_dispatch:
-env:
-  TEST_STATUS: 0
 jobs:
   DockerTests:
     runs-on: ubuntu-latest
@@ -30,52 +28,52 @@ jobs:
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
           .ci/system-tests/setup_system_tests.sh ${GITHUB_REF#refs/heads/}
       - name: ACA POLICY TEST 1 - Test ACA default policy
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 1
       - name: ACA POLICY TEST 2 - Test EK cert Only Validation Policy without a EK Issuer Cert in the trust store
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 2
       - name: ACA POLICY TEST 3 - Test EK Only Validation Policy
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 3
       - name: ACA POLICY TEST 4 - Test PC Validation Policy with no PC
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 4
       - name: ACA POLICY TEST 5 - Test FW and PC Validation Policy with no PC
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 5
       - name: ACA POLICY TEST 6 - Test PC Validation Policy with valid PC with no Attribute Check
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 6
       - name: ACA POLICY TEST 7 - Test PC Validation Policy with valid PC with Attribute Check
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 7
       - name: ACA POLICY TEST 8 - Test PC with RIM Validation Policy with valid PC and RIM
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 8
       - name: ACA POLICY TEST 9 - Test valid PC and RIM with PC only uploaded
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 9
       - name: ACA POLICY TEST 10 - Test valid PC and RIM with RIM only uploaded
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/aca_policy_tests.sh 10
@@ -85,17 +83,17 @@ jobs:
       #   run: |
       #     .ci/system-tests/tests/aca_policy_tests.sh
       - name: ACA PLATFORM CERTIFICATE TEST 1 - Test a delta Platform Certificate that adds a new memory component
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/platform_cert_tests.sh 1
       - name: ACA PLATFORM CERTIFICATE TEST 2 - Test a Platform Certificate that is missing a memory component
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/platform_cert_tests.sh 2
       - name: ACA PLATFORM CERTIFICATE TEST 3 - Test a Delta Platform Certificate that has a wrong a memory component
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/platform_cert_tests.sh 3
@@ -105,17 +103,17 @@ jobs:
       #   run: |
       #     .ci/system-tests/tests/platform_cert_tests.sh
       - name: ACA RIM TEST 1 - Test a RIM from an OEM and a Supplemental RIM from a VAR
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/rim_system_tests.sh 1
       - name: ACA RIM TEST 2 - Test a RIM from an OEM with a bad reference measurement and a Supplemental RIM from a VAR
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/rim_system_tests.sh 2
       - name: ACA RIM TEST 3 - Test a RIM from an OEM and a Supplemental RIM from a VAR with a bad reference measurement
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           .ci/system-tests/tests/rim_system_tests.sh 3
@@ -125,38 +123,21 @@ jobs:
       #   run: |
       #     .ci/system-tests/tests/rim_system_tests.sh
       - name: Copy System Test Log files
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           echo "*** Extracting ACA and Provisioner.Net logs ..."
           docker exec hirs-aca1 bash -c "mkdir -p /HIRS/logs/aca/ && cp -arp /var/log/hirs/* /HIRS/logs/aca/"
           docker exec hirs-provisioner1-tpm2 bash -c "mkdir -p /HIRS/logs/provisioner/ && cp -ap hirs*.log /HIRS/logs/provisioner/ && chmod -R 777 /HIRS/logs"
       - name: Docker Compose Down
-        continue-on-error: true
+        if: always()
         shell: bash
         run: |
           echo "*** Exiting and removing Docker containers and network ..."
           docker compose -f .ci/docker/docker-compose-system-test.yml down -v
-          if [[ ${TEST_STATUS} == "0" ]]; then
-            echo "******** SUCCESS: System Tests for TPM 2.0 passed ********"
-            echo "TEST_STATUS=0" >> $GITHUB_ENV
-            exit 0;
-          else
-            echo "******** FAILURE: System Tests for TPM 2.0 failed ********"
-            echo "TEST_STATUS=1" >> $GITHUB_ENV
-            exit 1
-          fi
       - name: Archive System Test Log files
         uses: actions/upload-artifact@v4
         with:
           name: System_Test_Log_Files
           path: logs/
           if-no-files-found: ignore
-      - name: Check System Test results
-        if: success() || failure()
-        run: |
-          if [ ${TEST_STATUS} == "0" ]; then
-            exit 0;
-          else
-            exit 1;
-          fi

From 6df75c594c6d75b9c4f17b00cd4c9efa5e03a50f Mon Sep 17 00:00:00 2001
From: "iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil"
 <iadgovuser26@empire.eclipse.ncsc.mil>
Date: Thu, 25 Jul 2024 13:49:09 -0400
Subject: [PATCH 2/7] Testing failure condition

---
 .ci/system-tests/sys_test_common.sh        | 8 ++++----
 .ci/system-tests/tests/aca_policy_tests.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.ci/system-tests/sys_test_common.sh b/.ci/system-tests/sys_test_common.sh
index a7604fba..11c3e672 100644
--- a/.ci/system-tests/sys_test_common.sh
+++ b/.ci/system-tests/sys_test_common.sh
@@ -70,15 +70,15 @@ uploadTrustedCerts() {
   # Upload CA Cert from IBMTSS Tools
   echo "Uploading Trust Certificates to ${HIRS_ACA_HOSTNAME}:${HIRS_ACA_PORTAL_PORT}"
   echo "Uploading the EK Certificate CA(s)..."
-  docker exec -i $tpm2_container /bin/bash -c "curl -k -F 'file=@/ibmtss/utils/certificates/cacert.pem' $SERVER_CACERT_POST"
+  docker exec -i $tpm2_container /bin/bash -c "curl -k -F 'file=@/ibmtss/utils/certificates/cacert.pem' $SERVER_CACERT_POST" > /dev/null
   echo "...done"
   # Upload Trusted Certs from HIRS
   echo "Uploading the Platform Certificate CA(s)..."
-  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/ca.crt' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST"
+  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/ca.crt' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null
   echo "...done"
   echo "Uploading the RIM CA(s)..."
-  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RIMCaCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST"
-  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RimSignCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST"
+  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RIMCaCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null
+  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RimSignCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null
   echo "...done"
 }
 
diff --git a/.ci/system-tests/tests/aca_policy_tests.sh b/.ci/system-tests/tests/aca_policy_tests.sh
index 3a6a838f..653e2493 100755
--- a/.ci/system-tests/tests/aca_policy_tests.sh
+++ b/.ci/system-tests/tests/aca_policy_tests.sh
@@ -102,7 +102,7 @@ if [ "$test" = "10" ] || [ "$test" = "all" ]; then
     uploadTrustedCerts
     setPlatformCerts -p "laptop" -t "default"
     setRims -p "laptop" -t "default" -u -n
-    provisionTpm2 "pass"
+    provisionTpm2 "fail"
 fi
 
 #  Process Test Results, any single failure will send back a failed result.

From 4f21e17f46f9b0d85b87e609a3c8d5ec592f38cd Mon Sep 17 00:00:00 2001
From: "iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil"
 <iadgovuser26@empire.eclipse.ncsc.mil>
Date: Thu, 25 Jul 2024 14:00:42 -0400
Subject: [PATCH 3/7] remove curl output from logs

---
 .ci/system-tests/container/pc_setup.sh     | 4 ++--
 .ci/system-tests/container/rim_setup.sh    | 4 ++--
 .ci/system-tests/tests/aca_policy_tests.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.ci/system-tests/container/pc_setup.sh b/.ci/system-tests/container/pc_setup.sh
index a2fddf69..6882cc93 100755
--- a/.ci/system-tests/container/pc_setup.sh
+++ b/.ci/system-tests/container/pc_setup.sh
@@ -86,7 +86,7 @@ dnf install -y unzip &> /dev/null
 
 # Step 2: Unpack the dmi files.
 echo "dmi file used was $dmiZip"
-unzip -o "$dmiZip" -d $HIRS_CI_TEST_ROOT
+unzip -o "$dmiZip" -d $HIRS_CI_TEST_ROOT > /dev/null
 
 # Step 3: Copy the platform cert to tcg folder and or upload it to the ACA
 if [[ ! -d $pcDir ]]; then
@@ -103,7 +103,7 @@ pushd $pcDir > /dev/null
       fi
       if [ "$UPLOAD_ARTIFACTS" = YES ]; then
         echo "Uploading $cert to $SERVER_PCERT_POST"
-        curl -k -F "file=@$cert" $SERVER_PCERT_POST
+        curl -k -F "file=@$cert" $SERVER_PCERT_POST > /dev/null
       fi
     done
   fi
diff --git a/.ci/system-tests/container/rim_setup.sh b/.ci/system-tests/container/rim_setup.sh
index 0c997934..869cd5fc 100755
--- a/.ci/system-tests/container/rim_setup.sh
+++ b/.ci/system-tests/container/rim_setup.sh
@@ -84,7 +84,7 @@ pushd $swidDir > /dev/null
       fi
       if [ "$UPLOAD_ARTIFACTS" = YES ]; then
         echo "Uploading $swidtag to $SERVER_RIM_POST"
-        curl -k -F "file=@$swidtag" $SERVER_RIM_POST
+        curl -k -F "file=@$swidtag" $SERVER_RIM_POST > /dev/null
       fi
     done
   fi
@@ -102,7 +102,7 @@ pushd $rimDir > /dev/null
       fi
       if [ "$UPLOAD_ARTIFACTS" = YES ]; then
         echo "Uploading $rim to $SERVER_RIM_POST"
-        curl -k -F "file=@$rim" $SERVER_RIM_POST
+        curl -k -F "file=@$rim" $SERVER_RIM_POST > /dev/null
       fi
     done
   fi
diff --git a/.ci/system-tests/tests/aca_policy_tests.sh b/.ci/system-tests/tests/aca_policy_tests.sh
index 653e2493..3a6a838f 100755
--- a/.ci/system-tests/tests/aca_policy_tests.sh
+++ b/.ci/system-tests/tests/aca_policy_tests.sh
@@ -102,7 +102,7 @@ if [ "$test" = "10" ] || [ "$test" = "all" ]; then
     uploadTrustedCerts
     setPlatformCerts -p "laptop" -t "default"
     setRims -p "laptop" -t "default" -u -n
-    provisionTpm2 "fail"
+    provisionTpm2 "pass"
 fi
 
 #  Process Test Results, any single failure will send back a failed result.

From df333fa36a1f8fe55b3642db7624ee430b97a309 Mon Sep 17 00:00:00 2001
From: "iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil"
 <iadgovuser26@empire.eclipse.ncsc.mil>
Date: Thu, 25 Jul 2024 14:16:58 -0400
Subject: [PATCH 4/7] save log on failure

---
 .ci/system-tests/tests/rim_system_tests.sh | 2 +-
 .github/workflows/system_test.yml          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.ci/system-tests/tests/rim_system_tests.sh b/.ci/system-tests/tests/rim_system_tests.sh
index 7ea5bc24..91cd2fc2 100755
--- a/.ci/system-tests/tests/rim_system_tests.sh
+++ b/.ci/system-tests/tests/rim_system_tests.sh
@@ -46,7 +46,7 @@ if [ "$test" = "3" ] || [ "$test" = "all" ]; then
     setPolicyEkPcFw
     setPlatformCerts -p "laptop" -t "badVarInstall"
     setRims -p "laptop" -t "badVarInstall"
-    provisionTpm2 "fail"
+    provisionTpm2 "pass"
 fi
 
 #  Process Test Results, any single failure will send back a failed result.
diff --git a/.github/workflows/system_test.yml b/.github/workflows/system_test.yml
index a5be1268..90e0d43c 100644
--- a/.github/workflows/system_test.yml
+++ b/.github/workflows/system_test.yml
@@ -136,6 +136,7 @@ jobs:
           echo "*** Exiting and removing Docker containers and network ..."
           docker compose -f .ci/docker/docker-compose-system-test.yml down -v
       - name: Archive System Test Log files
+	    if: always()
         uses: actions/upload-artifact@v4
         with:
           name: System_Test_Log_Files

From 577880c2f5eee83f128984547ac3873100643c1d Mon Sep 17 00:00:00 2001
From: "iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil"
 <iadgovuser26@empire.eclipse.ncsc.mil>
Date: Thu, 25 Jul 2024 14:25:35 -0400
Subject: [PATCH 5/7] save log on failure

---
 .github/workflows/system_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/system_test.yml b/.github/workflows/system_test.yml
index 90e0d43c..cb8b44e0 100644
--- a/.github/workflows/system_test.yml
+++ b/.github/workflows/system_test.yml
@@ -136,7 +136,7 @@ jobs:
           echo "*** Exiting and removing Docker containers and network ..."
           docker compose -f .ci/docker/docker-compose-system-test.yml down -v
       - name: Archive System Test Log files
-	    if: always()
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: System_Test_Log_Files

From 726dfe04b5426bcb858b77464faa1a34ccc416c7 Mon Sep 17 00:00:00 2001
From: "iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil"
 <iadgovuser26@empire.eclipse.ncsc.mil>
Date: Thu, 25 Jul 2024 14:42:07 -0400
Subject: [PATCH 6/7] Test reporting update complete

---
 .ci/system-tests/container/pc_setup.sh     | 4 ++--
 .ci/system-tests/sys_test_common.sh        | 6 +++---
 .ci/system-tests/tests/rim_system_tests.sh | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ci/system-tests/container/pc_setup.sh b/.ci/system-tests/container/pc_setup.sh
index 6882cc93..20de59e5 100755
--- a/.ci/system-tests/container/pc_setup.sh
+++ b/.ci/system-tests/container/pc_setup.sh
@@ -86,7 +86,7 @@ dnf install -y unzip &> /dev/null
 
 # Step 2: Unpack the dmi files.
 echo "dmi file used was $dmiZip"
-unzip -o "$dmiZip" -d $HIRS_CI_TEST_ROOT > /dev/null
+unzip -o "$dmiZip" -d $HIRS_CI_TEST_ROOT > /dev/null 2>&1
 
 # Step 3: Copy the platform cert to tcg folder and or upload it to the ACA
 if [[ ! -d $pcDir ]]; then
@@ -103,7 +103,7 @@ pushd $pcDir > /dev/null
       fi
       if [ "$UPLOAD_ARTIFACTS" = YES ]; then
         echo "Uploading $cert to $SERVER_PCERT_POST"
-        curl -k -F "file=@$cert" $SERVER_PCERT_POST > /dev/null
+        curl -k -F "file=@$cert" $SERVER_PCERT_POST > /dev/null 2>&1
       fi
     done
   fi
diff --git a/.ci/system-tests/sys_test_common.sh b/.ci/system-tests/sys_test_common.sh
index 11c3e672..d571ab51 100644
--- a/.ci/system-tests/sys_test_common.sh
+++ b/.ci/system-tests/sys_test_common.sh
@@ -74,11 +74,11 @@ uploadTrustedCerts() {
   echo "...done"
   # Upload Trusted Certs from HIRS
   echo "Uploading the Platform Certificate CA(s)..."
-  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/ca.crt' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null
+  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/ca.crt' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null 2>&1
   echo "...done"
   echo "Uploading the RIM CA(s)..."
-  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RIMCaCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null
-  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RimSignCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null
+  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RIMCaCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null 2>&1
+  docker exec -i $aca_container /bin/bash -c "curl -k -F 'file=@$HIRS_CI_REPO_ROOT/.ci/setup/certs/RimSignCert.pem' https://localhost:${HIRS_ACA_PORTAL_PORT}/$HIRS_ACA_POST_POINT_TRUST" > /dev/null 2>&1
   echo "...done"
 }
 
diff --git a/.ci/system-tests/tests/rim_system_tests.sh b/.ci/system-tests/tests/rim_system_tests.sh
index 91cd2fc2..7ea5bc24 100755
--- a/.ci/system-tests/tests/rim_system_tests.sh
+++ b/.ci/system-tests/tests/rim_system_tests.sh
@@ -46,7 +46,7 @@ if [ "$test" = "3" ] || [ "$test" = "all" ]; then
     setPolicyEkPcFw
     setPlatformCerts -p "laptop" -t "badVarInstall"
     setRims -p "laptop" -t "badVarInstall"
-    provisionTpm2 "pass"
+    provisionTpm2 "fail"
 fi
 
 #  Process Test Results, any single failure will send back a failed result.

From 301e1f71d23e5abeb7c37e5060d6b22c627abff6 Mon Sep 17 00:00:00 2001
From: "iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil"
 <iadgovuser26@empire.eclipse.ncsc.mil>
Date: Thu, 25 Jul 2024 14:57:30 -0400
Subject: [PATCH 7/7] minor log cleanup

---
 .ci/system-tests/container/rim_setup.sh | 4 ++--
 .ci/system-tests/sys_test_common.sh     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/system-tests/container/rim_setup.sh b/.ci/system-tests/container/rim_setup.sh
index 869cd5fc..69b5228b 100755
--- a/.ci/system-tests/container/rim_setup.sh
+++ b/.ci/system-tests/container/rim_setup.sh
@@ -84,7 +84,7 @@ pushd $swidDir > /dev/null
       fi
       if [ "$UPLOAD_ARTIFACTS" = YES ]; then
         echo "Uploading $swidtag to $SERVER_RIM_POST"
-        curl -k -F "file=@$swidtag" $SERVER_RIM_POST > /dev/null
+        curl -k -F "file=@$swidtag" $SERVER_RIM_POST > /dev/null  2>&1
       fi
     done
   fi
@@ -102,7 +102,7 @@ pushd $rimDir > /dev/null
       fi
       if [ "$UPLOAD_ARTIFACTS" = YES ]; then
         echo "Uploading $rim to $SERVER_RIM_POST"
-        curl -k -F "file=@$rim" $SERVER_RIM_POST > /dev/null
+        curl -k -F "file=@$rim" $SERVER_RIM_POST > /dev/null  2>&1
       fi
     done
   fi
diff --git a/.ci/system-tests/sys_test_common.sh b/.ci/system-tests/sys_test_common.sh
index d571ab51..01648ceb 100644
--- a/.ci/system-tests/sys_test_common.sh
+++ b/.ci/system-tests/sys_test_common.sh
@@ -70,7 +70,7 @@ uploadTrustedCerts() {
   # Upload CA Cert from IBMTSS Tools
   echo "Uploading Trust Certificates to ${HIRS_ACA_HOSTNAME}:${HIRS_ACA_PORTAL_PORT}"
   echo "Uploading the EK Certificate CA(s)..."
-  docker exec -i $tpm2_container /bin/bash -c "curl -k -F 'file=@/ibmtss/utils/certificates/cacert.pem' $SERVER_CACERT_POST" > /dev/null
+  docker exec -i $tpm2_container /bin/bash -c "curl -k -F 'file=@/ibmtss/utils/certificates/cacert.pem' $SERVER_CACERT_POST" > /dev/null 2>&1
   echo "...done"
   # Upload Trusted Certs from HIRS
   echo "Uploading the Platform Certificate CA(s)..."