Add arm64 and ppc64le as new platforms

.travis.yml

@@ -2,28 +2,52 @@ language: go
 sudo: required
 dist: trusty
 
-
-matrix:
-  include:
-    - go: 1.5.4
-      env: GO15VENDOREXPERIMENT=1
-    - go: 1.6.2
-    - go: tip
-  allow_failures: 
-    - go: tip
+go:
+  - 1.5.4
+  - 1.6.2
+  - tip
 
 env:
   global:
     - TOOLS_CMD=golang.org/x/tools/cmd
     - PATH=$GOROOT/bin:$PATH
+    - GO15VENDOREXPERIMENT=1
+  matrix:
+   - TARGET=amd64
+   - TARGET=arm
+   - TARGET=arm64
+   - TARGET=ppc64le
+
+matrix:
+  fast_finish: true
+  allow_failures: 
+    - go: tip
+  exclude:
+    - go: 1.5.4
+      env: arm
+    - go: 1.5.4
+      env: arm64
+    - go: 1.5.4
+      env: ppc64le
+    - go: tip
+      env: arm
+    - go: tip
+      env: arm64
+    - go: tip
+      env: ppc64le
 
 install:
  - go get ${TOOLS_CMD}/cover
  - go get github.com/modocache/gover
  - go get github.com/mattn/goveralls
 
 script:
- - ./test
+ - >
+    if [ "${TARGET}" == "amd64" ]; then
+      GOARCH="${TARGET}" ./test;
+    else
+      GOARCH="${TARGET}" ./build;
+    fi
 
 notifications:
   email: false

build

@@ -10,21 +10,20 @@ if [ ! -h gopath/src/${REPO_PATH} ]; then
 fi
 
 export GO15VENDOREXPERIMENT=1
-export GOBIN=${PWD}/bin
 export GOPATH=${PWD}/gopath
 
 echo "Building API"
 go build "$@" ${REPO_PATH}/libcni
 
 echo "Building reference CLI"
-go install "$@" ${REPO_PATH}/cnitool
+go build -o ${PWD}/bin/cnitool "$@" ${REPO_PATH}/cnitool
 
 echo "Building plugins"
 PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/* plugins/test/*"
 for d in $PLUGINS; do
 	if [ -d $d ]; then
 		plugin=$(basename $d)
 		echo "  " $plugin
-		go install "$@" ${REPO_PATH}/$d
+		go build -o ${PWD}/bin/$plugin "$@" ${REPO_PATH}/$d
 	fi
 done

scripts/release-with-rkt.sh

@@ -26,11 +26,17 @@ sudo -E rkt run \
     ${FEDORA_IMAGE} \
     --exec /bin/bash \
     -- -xe -c "\
-    ${FEDORA_INSTALL}; cd /opt/src; umask 0022; CGO_ENABLED=0 ./build ${BUILDFLAGS}; \
-    for format in txz tbz2 tgz; do \
-        FILENAME=cni-${TAG}.\$format; \
-        FILEPATH=${RELEASE_DIR}/\$FILENAME; \
-        tar -C ${OUTPUT_DIR} --owner=0 --group=0 -caf \$FILEPATH .; \
+    ${FEDORA_INSTALL}; cd /opt/src; umask 0022; 
+    for arch in amd64 arm arm64 ppc64le; do \
+        CGO_ENABLED=0 GOARCH=\$arch ./build ${BUILDFLAGS}; \
+        for format in txz tbz2 tgz; do \
+            FILENAME=cni-\$arch-${TAG}.\$format; \
+            FILEPATH=${RELEASE_DIR}/\$FILENAME; \
+            tar -C ${OUTPUT_DIR} --owner=0 --group=0 -caf \$FILEPATH .; \
+            if [ \"\$arch\" == \"amd64\" ]; then \
+                cp \$FILEPATH ${RELEASE_DIR}/cni-${TAG}.\$format; \
+            fi; \
+        done; \
     done; \
     wget -O - ${ACBUILD_URL} | tar -C /usr/bin -xzvf -; \
     ${ACBUILD} begin; \

test

@@ -35,7 +35,7 @@ TEST=${split[@]/#/${REPO_PATH}/}
 
 echo -n "Running tests "
 function testrun {
-    sudo -E bash -c "umask 0; PATH=$GOROOT/bin:$GOBIN:$PATH go test -covermode set $@"
+    sudo -E bash -c "umask 0; PATH=$GOROOT/bin:$(pwd)/bin:$PATH go test -covermode set $@"
 }
 if [ ! -z "${COVERALLS}" ]; then
     echo "with coverage profile generation..."