Skip to content

Commit

Permalink
Renamed DockerTests to HIRS_SYSTEM_TESTS
Browse files Browse the repository at this point in the history
  • Loading branch information
iadgovuser26 committed Jul 22, 2024
1 parent 4872c86 commit 1f8dd7c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
13 changes: 1 addition & 12 deletions .ci/system-tests/container/pc_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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

Expand All @@ -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
Expand All @@ -108,4 +98,3 @@ pushd $pcDir > /dev/null
done
fi
popd > /dev/null

Binary file removed .ci/system-tests/profiles/laptop/laptop_dmi.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion .github/workflows/system_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit 1f8dd7c

Please sign in to comment.