Skip to content

Commit

Permalink
Add execution of ABX VPP plugin tests (#64)
Browse files Browse the repository at this point in the history
  • Loading branch information
pt-maros authored Sep 7, 2022
1 parent 23b5bdd commit fbcef25
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ test-vpp-plugins: vpp-image vpp-test-image
test-vpp-plugins-prebuilt: # For running VPP tests repeatedly (saves time by skipping building process)
docker run --privileged --name=vpp-test -d ${STONEWORK_VPP_TEST_IMAGE}:${VPP_VERSION}
docker cp ./vpp/isisx/vpp$(shell echo ${VPP_VERSION} | tr -d ".")/isisx vpp-test:/opt/dev/vpp/src/plugins/isisx
docker exec -it vpp-test sh -c "cd /opt/dev/vpp;make test TEST=isisx"
docker cp ./vpp/abx/vpp$(shell echo ${VPP_VERSION} | tr -d ".")/abx vpp-test:/opt/dev/vpp/src/plugins/abx
docker exec -it vpp-test sh -c "cd /opt/dev/vpp;make test TEST=isisx;make test TEST=abx"
docker rm -f vpp-test

# -------------------------------
Expand Down
4 changes: 3 additions & 1 deletion docker/vpp-test.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ ENV LANG=C.UTF-8
RUN set -ex; \
cp -r /opt/dev/abx/abx /opt/dev/vpp/src/plugins/abx && \
cp -r /opt/dev/isisx/isisx /opt/dev/vpp/src/plugins/isisx && \
cp -r /opt/dev/isisx/test /opt/dev/vpp/
cp -r /opt/dev/isisx/test /opt/dev/vpp/ && \
cp -r /opt/dev/abx/test /opt/dev/vpp/

WORKDIR /opt/dev/vpp

ARG CACHEBUST=1
RUN make test TEST=isisx
RUN make test TEST=abx
4 changes: 2 additions & 2 deletions docker/vpp.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@ RUN set -ex; \

COPY docker/vpp-startup.conf /etc/vpp/startup.conf

CMD ["/bin/bash", "-c", "mkdir -p /run/stonework/vpp; \
exec /usr/bin/vpp -c /etc/vpp/startup.conf"]
CMD /bin/bash -c "mkdir -p /run/stonework/vpp; \
exec /usr/bin/vpp -c /etc/vpp/startup.conf"

0 comments on commit fbcef25

Please sign in to comment.