diff options
| author |   YohanPipereau <ypiperea@cisco.com> | 2019-07-15 15:37:46 +0200 |
|---|---|---|
| committer | YohanPipereau <ypiperea@cisco.com> | 2019-07-26 15:29:05 +0200 |
| commit | 18561adfde80d6665e24262d70d18f916e2662e5 (patch) | |
| tree | 06683574ba18ee25012f77b18da7c0e35a5707aa /scripts | |
| parent | adc56bc5ddcdf947864d982cda809588b7ccd8bc (diff) | |
vom: migration from scvpp to vom
Change-Id: I79609f0bee9b8307da0d9bf704babe8ba06dba4d
Signed-off-by: YohanPipereau <ypiperea@cisco.com>
Co-authored-by: Pavel Kotucek <pavel.kotucek@pantheon.tech>
Co-authored-by: Andrej Kozemcak <andrej.kozemcak@pantheon.tech>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Dockerfile | 12 | ||||
| -rwxr-xr-x | scripts/run_test.sh | 1 |
2 files changed, 5 insertions, 8 deletions
diff --git a/scripts/Dockerfile b/scripts/Dockerfile index f45af42..873a19c 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:18.04 -ARG vpp_version=release +ARG vpp_version=master # Layer0: Prepare sweetcomb environement by installing sysrepo, netopeer2 & vpp # Layer1: Install vpp @@ -15,14 +15,12 @@ RUN make install-dep && make install-dep-extra RUN rm -rf /opt/dev/* #Layer1 -RUN apt-get install -y \ - sudo curl \ - inetutils-ping \ - && curl -s https://packagecloud.io/install/repositories/fdio/$vpp_version/script.deb.sh | sudo bash \ - && apt-get -y --force-yes install vpp libvppinfra* vpp-plugin-* vpp-dev +RUN apt-get install -y curl inetutils-ping \ + && curl -s https://packagecloud.io/install/repositories/fdio/$vpp_version/script.deb.sh | bash \ + && apt-get -y --force-yes install vpp libvppinfra* vpp-plugin-* vpp-dev vom #Layer2 COPY . /root/src/sweetcomb WORKDIR /root/src/sweetcomb -RUN make install-dep && make build-scvpp && make build-plugins +RUN make install-dep && make build-plugins diff --git a/scripts/run_test.sh b/scripts/run_test.sh index 76b1ca1..1c50247 100755 --- a/scripts/run_test.sh +++ b/scripts/run_test.sh @@ -42,7 +42,6 @@ docker run -id --privileged --name ${CONTAINER} ${IMAGE_TEST} docker cp . ${CONTAINER}:/root/src/sweetcomb docker exec -it ${CONTAINER} bash -c " cd /root/src/sweetcomb && - make build-scvpp && make build-plugins" if [ "$?" == 0 ]; then echo "Run tests" |