Merge pull request #509 from intel-go/gregory/quickfix

Fixed parallel make in Travis. Switched to "master" branch in VMs

Author: gshimansky

Diff for: .travis.yml

@@ -17,6 +17,7 @@ before_script:
   - docker run -it -d --privileged -v /usr/src:/usr/src -v /lib/modules:/lib/modules -v /sys/devices/system/node:/sys/devices/system/node --name test-nff-go test-cosmic /bin/bash
 
 script:
+  - docker exec -i test-nff-go go mod download
   - docker exec -i test-nff-go make
   # Build standalone examples
   - docker exec -i test-nff-go bash -c "cd examples && make gopacketParserExample && cd .."

Diff for: vagrant/Vagrantfile

@@ -79,6 +79,17 @@ network:
       dhcp4: true
       dhcp6: true
       optional: true
+    enp0s3:
+      dhcp4: true
+      dhcp6: true
+      optional: true
+EOF'
+    sudo sh -c 'cat > /etc/netplan/50-vagrant.yaml <<EOF
+---
+network:
+  version: 2
+  renderer: networkd
+  ethernets: {}
 EOF'
 fi
 
@@ -123,12 +134,12 @@ setuptesthost
 
 echo Downloading and building NFF-GO framework
 go get -v golang.org/x/tools/cmd/stringer
-git clone -b develop --recurse-submodules http://github.com/intel-go/nff-go
-(cd nff-go; make -j1)
+git clone -b master --recurse-submodules http://github.com/intel-go/nff-go
+(cd nff-go; go mod download; make)
 echo Downloading and building NFF-GO NAT example and its dependencies
 go get github.com/golang/protobuf/protoc-gen-go
-git clone -b develop --recurse-submodules http://github.com/intel-go/nff-go-nat
-(cd nff-go-nat; . env.sh; make  -j1)
+git clone -b master --recurse-submodules http://github.com/intel-go/nff-go-nat
+(cd nff-go-nat; go mod download; . env.sh; make)
 ./nff-go-nat/test/httpperfserv/install-systemd-service.sh "-port 8008"
 
 echo Setting up 1024 huge pages

Diff for: vagrant/scripts.sh

@@ -1,4 +1,3 @@
-export DPDK_VERSION=18.11
 export GOROOT=/opt/go
 export NFF_GO="$HOME"/nff-go
 export PATH="$HOME"/go/bin:"$GOROOT"/bin:"$PATH"
@@ -12,14 +11,14 @@ export CARD2=ens7
 bindports ()
 {
     sudo modprobe uio
-    sudo insmod "$NFF_GO"/dpdk/dpdk-${DPDK_VERSION}/x86_64-native-linuxapp-gcc/kmod/igb_uio.ko
-    sudo "$NFF_GO"/dpdk/dpdk-${DPDK_VERSION}/usertools/dpdk-devbind.py --bind=igb_uio $NFF_GO_CARDS
+    sudo insmod "$NFF_GO"/dpdk/dpdk/x86_64-native-linuxapp-gcc/kmod/igb_uio.ko
+    sudo "$NFF_GO"/dpdk/dpdk/usertools/dpdk-devbind.py --bind=igb_uio $NFF_GO_CARDS
 }
 
 # Bind ports to Linux kernel driver
 unbindports ()
 {
-    sudo "$NFF_GO"/dpdk/dpdk-${DPDK_VERSION}/usertools/dpdk-devbind.py --bind=e1000 $NFF_GO_CARDS
+    sudo "$NFF_GO"/dpdk/dpdk/usertools/dpdk-devbind.py --bind=e1000 $NFF_GO_CARDS
 }
 
 # Run pktgen