Skip to content

Fix baseline tests #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jboddey merged 2 commits into from
Sep 30, 2024
Merged

Fix baseline tests #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d79aadf
updated baseline ubuntu image, added --break-system-packages flag to …
Sep 27, 2024
5712275
Merge branch 'dev' into fix_baseline
jboddey Sep 30, 2024
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
7 changes: 4 additions & 3 deletions modules/network/base/base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Image name: testrun/base
FROM ubuntu@sha256:e6173d4dc55e76b87c4af8db8821b1feae4146dd47341e4d431118c7dd060a74
FROM ubuntu@sha256:77d57fd89366f7d16615794a5b53e124d742404e20f035c22032233f1826bd6a

RUN apt-get update

Expand All @@ -30,8 +30,9 @@ COPY $COMMON_DIR/ /testrun/python/src/common
# Setup the base python requirements
COPY $MODULE_DIR/python /testrun/python

# Install all python requirements for the module
RUN pip3 install -r /testrun/python/requirements.txt
# Install all python requirements for the module
# --break-system-packages flag used to bypass PEP668
RUN pip3 install --break-system-packages -r /testrun/python/requirements.txt

# Add the bin files
COPY $MODULE_DIR/bin /testrun/bin
Expand Down
6 changes: 4 additions & 2 deletions modules/network/radius/radius.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ RUN apt-get update && apt-get install -y openssl freeradius git
RUN git clone --branch 0.0.25 https://github.com/faucetsdn/chewie

# Install chewie as Python module
RUN pip3 install chewie/
# --break-system-packages flag used to bypass PEP668
RUN pip3 install --break-system-packages chewie/

EXPOSE 1812/udp
EXPOSE 1813/udp
Expand All @@ -40,4 +41,5 @@ COPY $MODULE_DIR/bin /testrun/bin
COPY $MODULE_DIR/python /testrun/python

# Install all python requirements for the module
RUN pip3 install -r /testrun/python/requirements.txt
# --break-system-packages flag used to bypass PEP668
RUN pip3 install --break-system-packages -r /testrun/python/requirements.txt
9 changes: 6 additions & 3 deletions testing/baseline/test_baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ ifconfig
sudo apt-get update
sudo apt-get install openvswitch-common openvswitch-switch tcpdump jq moreutils coreutils isc-dhcp-client

pip3 install pytest==7.4.4

# Setup device network
sudo ip link add dev endev0a type veth peer name endev0b
sudo ip link set dev endev0a up
Expand Down Expand Up @@ -74,6 +72,11 @@ echo "Done baseline test"

more $TESTRUN_OUT

pytest testing/baseline/test_baseline.py
# Needs to be sudo because this invokes bin/testrun
sudo venv/bin/python3 -m pytest -v testing/baseline/test_baseline.py

# Clean the device network
sudo ip link del dev endev0a
sudo docker network rm endev0

exit $?
2 changes: 1 addition & 1 deletion testing/docker/ci_baseline/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu@sha256:e6173d4dc55e76b87c4af8db8821b1feae4146dd47341e4d431118c7dd060a74
FROM ubuntu@sha256:77d57fd89366f7d16615794a5b53e124d742404e20f035c22032233f1826bd6a

# Update and get all additional requirements not contained in the base image
RUN apt-get update && apt-get -y upgrade
Expand Down