From 1f8dd7c3271709043bac7c4f4d2ddabb730e47f9 Mon Sep 17 00:00:00 2001
From: "iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil"
 <iadgovuser26@empire.eclipse.ncsc.mil>
Date: Mon, 22 Jul 2024 16:35:29 -0400
Subject: [PATCH] Renamed DockerTests to HIRS_SYSTEM_TESTS

---
 .ci/system-tests/container/pc_setup.sh          |  13 +------------
 .ci/system-tests/profiles/laptop/laptop_dmi.zip | Bin 5437 -> 0 bytes
 .github/workflows/system_test.yml               |   2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 .ci/system-tests/profiles/laptop/laptop_dmi.zip

diff --git a/.ci/system-tests/container/pc_setup.sh b/.ci/system-tests/container/pc_setup.sh
index a2fddf693..e503d4a9d 100755
--- a/.ci/system-tests/container/pc_setup.sh
+++ b/.ci/system-tests/container/pc_setup.sh
@@ -56,7 +56,6 @@ done
 profileDir="$HIRS_CI_REPO_ROOT/.ci/system-tests/profiles/$profile"
 testDir="$profileDir/$test"
 pcDir="$testDir/platformcerts"
-dmiZip="$profileDir/$profile"_dmi.zip
 hwJsonFileName="$profile"_"$test"_hw.json
 hwJsonFile="$testDir/$hwJsonFileName"
 
@@ -66,11 +65,6 @@ if [ ! -f "$hwJsonFile" ]; then
     hwJsonFile=$HIRS_CI_TEST_DEFAULT_HW_JSON_FILE
 fi
 
-if [ ! -f "$dmiZip" ]; then
-    echo "Test is using a profile with no DMI data. Using default."
-    dmiZip=$HIRS_CI_TEST_DEFAULT_DMI_ZIP
-fi
-
 # Ensure platform folder under efi is set up and cleared
 $HIRS_CI_REPO_ROOT/.ci/system-tests/container/efi_setup.sh -p
 
@@ -84,11 +78,7 @@ fi
 # Can remove this once unzip is added to the image
 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
-
-# Step 3: Copy the platform cert to tcg folder and or upload it to the ACA
+# Step 2: Copy the platform cert to tcg folder and or upload it to the ACA
 if [[ ! -d $pcDir ]]; then
     pcDir=$profileDir/default/platformcerts
 fi
@@ -108,4 +98,3 @@ pushd $pcDir > /dev/null
     done
   fi
 popd > /dev/null
-
diff --git a/.ci/system-tests/profiles/laptop/laptop_dmi.zip b/.ci/system-tests/profiles/laptop/laptop_dmi.zip
deleted file mode 100644
index c6f95f37ae21a84e28f638ba0447ba423d10fd19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5437
zcmcJTUuYav6vijnq-mRtHveiuOG#*?ASRh4yV*@2gkVIHO-n4%B(<<icBXc5v%Buh
zBn?9AVg<E^k~Bumi%?2S(e|NK@yQpVP;A~rQBl#RAe0ED4W&ML&dl7s=g#izZcrzj
zO#<29J@>okocnFYBEG7f5<Vj%*_W&zoR=zTucXezyI&sPA^AQVyBR%v>QU4@Su0gk
z;a^xUW1jD>ao!zQIbf_9U<{VO`P(<uwZO*M#R1dtlpa+TL$gx(3R1yvr6PyB<xqF8
z+!NZ#vl=>c;K-E|cLrJkh|x%(DJ7#ubuAND5*8P;E0AG#uz&Q>#87Yd_(Wf?9FjwW
zeRA(WxZ7H#37Fe0<z9Sru6-JQdkdnDuVQMmTGGf#h%&nJey}<B#>4xD|I0(S)^3bE
z^Q}I-cI*D_$oIbMXZ@R_n;%?VI^uu!VcqS`1;2mo>idi1P3w<4R@9Z{OBYvHkG4!U
zFE>v$w+}ycw{`N&<k62Ss?YAN^MAgyxV{we4_3bL$}x${ff|2$@5)Ept+XYnnJ1dg
zq*OCzP(eI|cJv@BW997WS*U*kuoy&ThD|Cn_UWMl1ymSSjJRQ{T3av}mI)dUaN_#A
zSu9Zul5y;WqU&)z3IeOCOtB*z(h`Zb;bg4K1wOy+hu#W+Vzh867#Q%H5jB+8im?e2
zWuUp%bEG~m<mn-TSDuhw?jg06PR(f<ySuP%Po6H)o_~Oj4QnH(DglJi#&feV88d0b
zXSApiGvc#a6o0n1jno2UdPc}z@=Z1Rfs3)ni>(`qVd}-OW>PoP=~TwhR3a=c0NmWu
z?p{DKjg)TcX{dy#swI^9=uFXNct^N(+3!X(T^zioZdsZemw!xEL+%(&ZhS12G%_iB
z0C`A_n<HXi4}Vg-@cTBvVUT9C=H#rF(c`J4rLso{_jCoj`dmob3%f~{&R8geN`UT8
zpgCG&m-Orwd%+`5*0VHEkAY6|#OcyEwEikPo`(F5>#v)|+FuS0^|*kO@4b1~2M2>e
zHqJ6M=F@g(d8F4vTMHBP7}$(g`UcA%*oZy9AvNrP6fwwDWdr-TG80eC7uz};*<|}z
zn{T&%{rG8MVvy}Ku4%^AVzn8F!B;R4=#=HY{?0(GNA3*E0kv~F7?T6XgP}m6ua~Uo
zt~7FjPB-K(hySL~rmgzj>eYaP5B${BilzyJ%mEu%M%@m|c4gR}BLY${{`vFaDWJ_k
zJjqLUCZ#HgxMEMhYjEFUxLil%|2G@B=W`neeyxG*FvxXi?>XlQJUT%Rj}L_V;jk+z
z_xZd$Y73C@*(GfZ;&<DzR@;u%wdrD{8gKyigQVvilI31Y!}7hW4XXfa(UCpPVZ_M-
zwSbGIDWZU)dF50o`yHVQRu;f0Xu-XE`Bes%q>I^uV24me*gJEt<tZQzDux7F_6|p~
zIl#tNX&Lg}B}aE;4}zO<vSnzyu1e>O`cl8v?393gY9Dei8@24#DyFbqr--IERf~ZB
zD<4e;N@==#=+z7KLAZDvMX2p8PY=5V?AJP>C000=8PC$0y6sh)km)aOBr{ur358V(
z7*N_M`396$$N&snRw0&SW~(qeTHXRwnf9DA*f6W^1q$2I@|K|{eZQdArhA#(K5XZk
zv!>-OB-&CY8182r?2sT>&ZL$m=etuz#z}aYlSQuz;1a_S!L*}x3)=k6!E6fTZq(9j
zcRw`>><GAQM-FyZ+nxfz1wP5r!gP-TG3g5&%qNUv-hu5o#QBI3y(?Av0cSHoEGJtY
zSG2H{I|MhmBL>UaHnin|y|0Mnd@#8p%Fsgevoz;>9L=;~?zVK+`IeTWrR?+YpA^<A
z&L<_?-~zZrLA#5tK`6Q}I9Twp!2MS>R||GuDCR9)JXp`7jpbr=WRJPov;{p+(96zJ
s@-<H8<`$$VU~Jv(Cpu6H9fLj+q{#V(g1J`Xhiz#ee7ys2ykIrqKRl|TYXATM

diff --git a/.github/workflows/system_test.yml b/.github/workflows/system_test.yml
index b8b0431c7..e6843775a 100644
--- a/.github/workflows/system_test.yml
+++ b/.github/workflows/system_test.yml
@@ -11,7 +11,7 @@ on:
 env:
   TEST_STATUS: 0
 jobs:
-  DockerTests:
+  HIRS_SYSTEM_TESTS:
     runs-on: ubuntu-latest
     outputs:
       test-result: ${{ steps.set_outputs.outputs.test-result }}