Skip to content

Commit fbcef25

Browse files
authored
Add execution of ABX VPP plugin tests (#64)
1 parent 23b5bdd commit fbcef25

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ test-vpp-plugins: vpp-image vpp-test-image
209209
test-vpp-plugins-prebuilt: # For running VPP tests repeatedly (saves time by skipping building process)
210210
docker run --privileged --name=vpp-test -d ${STONEWORK_VPP_TEST_IMAGE}:${VPP_VERSION}
211211
docker cp ./vpp/isisx/vpp$(shell echo ${VPP_VERSION} | tr -d ".")/isisx vpp-test:/opt/dev/vpp/src/plugins/isisx
212-
docker exec -it vpp-test sh -c "cd /opt/dev/vpp;make test TEST=isisx"
212+
docker cp ./vpp/abx/vpp$(shell echo ${VPP_VERSION} | tr -d ".")/abx vpp-test:/opt/dev/vpp/src/plugins/abx
213+
docker exec -it vpp-test sh -c "cd /opt/dev/vpp;make test TEST=isisx;make test TEST=abx"
213214
docker rm -f vpp-test
214215

215216
# -------------------------------

docker/vpp-test.Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ ENV LANG=C.UTF-8
3535
RUN set -ex; \
3636
cp -r /opt/dev/abx/abx /opt/dev/vpp/src/plugins/abx && \
3737
cp -r /opt/dev/isisx/isisx /opt/dev/vpp/src/plugins/isisx && \
38-
cp -r /opt/dev/isisx/test /opt/dev/vpp/
38+
cp -r /opt/dev/isisx/test /opt/dev/vpp/ && \
39+
cp -r /opt/dev/abx/test /opt/dev/vpp/
3940

4041
WORKDIR /opt/dev/vpp
4142

4243
ARG CACHEBUST=1
4344
RUN make test TEST=isisx
45+
RUN make test TEST=abx

docker/vpp.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,5 @@ RUN set -ex; \
8787

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

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

0 commit comments

Comments
 (0)