Skip to content

Commit

Permalink
[rom_ext_e2e] Update CI to run ROM_EXT tests on hyper310
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Frantz <[email protected]>
  • Loading branch information
cfrantz committed Aug 29, 2024
1 parent 9a7e239 commit 4b78f40
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -654,23 +654,23 @@ jobs:
demands: BOARD -equals cw310
timeoutInMinutes: 60
dependsOn:
- chip_earlgrey_cw310
- chip_earlgrey_cw310_hyperdebug
- sw_build
condition: succeeded( 'chip_earlgrey_cw310', 'sw_build' )
condition: succeeded( 'chip_earlgrey_cw310_hyperdebug', 'sw_build' )
steps:
- template: ci/checkout-template.yml
- template: ci/install-package-dependencies.yml
- template: ci/download-artifacts-template.yml
parameters:
downloadPartialBuildBinFrom:
- chip_earlgrey_cw310
- chip_earlgrey_cw310_hyperdebug
- sw_build
- template: ci/load-bazel-cache-write-creds.yml
- bash: |
set -e
. util/build_consts.sh
module load "xilinx/vivado/$(VIVADO_VERSION)"
ci/scripts/run-fpga-tests.sh cw310 fpga_cw310_rom_ext_tests || { res=$?; echo "To reproduce failures locally, follow the instructions at https://opentitan.org/book/doc/getting_started/setup_fpga.html#reproducing-fpga-ci-failures-locally"; exit "${res}"; }
ci/scripts/run-fpga-tests.sh hyper310 fpga_hyper310_rom_ext_tests || { res=$?; echo "To reproduce failures locally, follow the instructions at https://opentitan.org/book/doc/getting_started/setup_fpga.html#reproducing-fpga-ci-failures-locally"; exit "${res}"; }
displayName: Execute tests
- template: ci/publish-bazel-test-results.yml

Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/run-fpga-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ then
> "${pattern_file}"
# We need to remove tests tagged as manual since we are not using a wildcard target.
test_args="${test_args} --test_tag_filters=cw310_sival,-broken,-skip_in_ci,-manual"
elif [ "${fpga_tags}" == "fpga_cw310_rom_ext_tests" ]
elif [ "${fpga_tags}" == "fpga_hyper310_rom_ext_tests" ]
then
test_args="${test_args} --test_tag_filters=cw310_rom_ext,-broken,-skip_in_ci"
test_args="${test_args} --test_tag_filters=hyper310_rom_ext,-broken,-skip_in_ci"
echo "//sw/device/silicon_creator/rom_ext/e2e/..." > "${pattern_file}"
else
test_args="${test_args} --test_tag_filters=${fpga_tags},-broken,-skip_in_ci"
Expand Down
4 changes: 3 additions & 1 deletion rules/opentitan/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ def _parameter_name(env, pname):
def _hacky_tags(env):
(_, suffix) = env.split(":")
tags = []
if suffix.startswith("fpga_cw310_") or suffix.startswith("fpga_cw340_"):
if (suffix.startswith("fpga_cw310_") or
suffix.startswith("fpga_cw340_") or
suffix.startswith("fpga_hyper310")):
# We have tags like "cw310_rom_with_real_keys" or "cw310_test_rom"
# applied to our tests. Since there is no way to adjust tags in a
# rule's implementation, we have to infer these tag names from the
Expand Down

0 comments on commit 4b78f40

Please sign in to comment.