.travis:Adjust travis related code

Add arch key to facilitate subsequent support of multiple CPU arch; Add function to install clang distinguish by CPU Signed-off-by: Jianlin Lv <[email protected]>
wangli8850 · Feb 25, 2020 · 3d81edb · 3d81edb
1 parent 3b055d1
commit 3d81edb
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,15 @@ dist: trusty
 sudo: required
 
 go:
- - 1.13.8
+  - 1.13.8
+
+arch:
+  - amd64
+  - arm64
+
+jobs:
+  allow_failures:
+  - arch: arm64
 
 if: branch = master OR type = pull_request
 
@@ -17,6 +25,5 @@ before_install: ./.travis/prepare.sh
 
 before_script:
   - export PATH=/usr/local/clang/bin:$PATH
-  - export GO=/home/travis/.gimme/versions/go1.13.8.linux.amd64/bin/go
 
 script: ./.travis/build.sh
diff --git a/.travis/prepare.sh b/.travis/prepare.sh
@@ -1,15 +1,32 @@
 #!/bin/bash
 
-CLANG_DIR="clang+llvm-3.8.1-x86_64-linux-gnu-ubuntu-14.04"
-CLANG_FILE="${CLANG_DIR}.tar.xz"
-CLANG_URL="http://releases.llvm.org/3.8.1/$CLANG_FILE"
+CLANG_VERSION=3.8.1
 
-wget -nv $CLANG_URL
-sudo rm -rf /usr/local/clang
-sudo mkdir -p /usr/local
-sudo tar -C /usr/local -xJf $CLANG_FILE
-sudo ln -s /usr/local/$CLANG_DIR /usr/local/clang
-rm $CLANG_FILE
+function setup_env() {
+case `uname -m` in
+  'x86_64' )
+    CLANG_DIR="clang+llvm-$CLANG_VERSION-x86_64-linux-gnu-ubuntu-14.04"
+    ;;
+  'aarch64' )
+    CLANG_DIR="clang+llvm-$CLANG_VERSION-aarch64-linux-gnu"
+    ;;
+esac
+}
+
+function install_clang() {
+  CLANG_FILE="$CLANG_DIR.tar.xz"
+  CLANG_URL="http://releases.llvm.org/$CLANG_VERSION/$CLANG_FILE"
+
+  wget -nv $CLANG_URL
+  sudo rm -rf /usr/local/clang
+  sudo mkdir -p /usr/local
+  sudo tar -C /usr/local -xJf $CLANG_FILE
+  sudo ln -s /usr/local/$CLANG_DIR /usr/local/clang
+  rm $CLANG_FILE
+}
+
+setup_env
+install_clang
 
 NEWPATH="/usr/local/clang/bin"
 export PATH="$NEWPATH:$PATH"

diff --git a/Makefile b/Makefile
@@ -102,7 +102,7 @@ ifeq ($(SKIP_KVSTORES),"false")
 	$(CONTAINER_ENGINE_FULL) run -d \
 		--name "cilium-etcd-test-container" \
 		-p 4002:4001 \
-		quay.io/coreos/etcd:v3.2.17 \
+		$(ETCD_IMAGE) \
 		etcd -name etcd0 \
 		-advertise-client-urls http://0.0.0.0:4001 \
 		-listen-client-urls http://0.0.0.0:4001 \

diff --git a/Makefile.defs b/Makefile.defs
@@ -82,3 +82,9 @@ endif
 # Container engine
 CONTAINER_ENGINE?=docker
 CONTAINER_ENGINE_FULL=$(QUIET)$(CONTAINER_ENGINE)
+
+ifeq ($(shell uname -m),aarch64)
+    ETCD_IMAGE=quay.io/coreos/etcd:v3.2.17-arm64
+else
+    ETCD_IMAGE=quay.io/coreos/etcd:v3.2.17
+endif