Skip to content
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

test: upgrade trex image to v3.06 #712

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

test: upgrade trex image to v3.06 #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 test/yaml/trex/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update && apt-get install -y \
python3 libzmq5 python3-distutils iproute2 \
Expand Down
4 changes: 1 addition & 3 deletions test/yaml/trex/build.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update && apt-get install -y \
gcc g++ git zlib1g-dev pciutils kmod \
python3-pip
RUN pip3 install meson pyelftools ninja
RUN mkdir -p /scratch/patches

ADD patches/* /scratch/patches/

ADD build_script.sh /scratch/build_script.sh

CMD /scratch/build_script.sh
Expand Down
7 changes: 2 additions & 5 deletions test/yaml/trex/build_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ mkdir -p ${BUILD_DIR}/trex_build
cd ${BUILD_DIR}/trex_build

if [ ! -d trex-core ]; then
git clone https://github.com/cisco-system-traffic-generator/trex-core.git
cd trex-core
git checkout ddce00f6fdea89850e0bf939fc82b96079fdcde5
git apply /scratch/patches/0000-memif-abstract-trex.patch
cd linux_dpdk
git clone -b v3.06 https://github.com/cisco-system-traffic-generator/trex-core.git
cd trex-core/linux_dpdk
./b configure
fi

Expand Down
71 changes: 0 additions & 71 deletions test/yaml/trex/patches/0000-memif-abstract-trex.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/yaml/trex/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
spec:
containers:
- name: trex
image: calicovpp/test-trex
image: calicovpp/test-trex:v3.06
imagePullPolicy: IfNotPresent
securityContext:
privileged: true
Expand Down
Loading