Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pfexec chown "$UID" /out

banner "P4 Codegen"
# Add gcc-12 so the p4 compiler can find cpp
PATH=/opt/gcc-12/bin:$PATH cargo xtask codegen --stages $TOFINO_STAGES
PATH=/opt/gcc-12/bin:$PATH cargo xtask codegen --stages $TOFINO_STAGES --multicast

# Preserve all the diagnostics spit out by the compiler
mkdir -p /out/p4c-diags
Expand Down
34 changes: 0 additions & 34 deletions .github/buildomat/jobs/multicast-test.sh

This file was deleted.

15 changes: 5 additions & 10 deletions .github/buildomat/packet-test-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@ export WS=$wd
MODEL_STARTUP_TIMEOUT=${MODEL_STARTUP_TIMEOUT:=5}
STARTUP_TIMEOUT=${STARTUP_TIMEOUT:=120}

if [ x$MULTICAST == x ]; then
BUILD_FEATURES=tofino_asic
CODEGEN_FEATURES=
SWADM_FEATURES=
else
BUILD_FEATURES=tofino_asic,multicast
CODEGEN_FEATURES=--multicast
SWADM_FEATURES=--features=multicast
fi

BUILD_FEATURES=tofino_asic

CODEGEN_FEATURES=--multicast
SWADM_FEATURES="--features=multicast"

function cleanup {
set +o errexit
set +o pipefail
Expand Down
Loading