.travis: Adjust travis related code #10327
Conversation
|
Release note label not set, please set the appropriate release note. |
pchaigno
added
area/CI
There was a problem hiding this comment.
I checked that the initial Travis CI build setup works for aarch64 as well. (It fails in the unit tests.)
I`m working on unit tests to supprot Arm64 and trying to fixed currently issue; |
.travis/prepare.sh
Outdated
| ;; | ||
| 'aarch64' ) | ||
| CLANG_DIR="clang+llvm-$CLANG_VERSION-aarch64-linux-gnu" | ||
| sed -i 's/etcd:v3.2.17/etcd:v3.2.17-arm64/g' $GOPATH/src/github.com/cilium/cilium/Makefile.defs |
There was a problem hiding this comment.
instead of using sed, can't you run make with ETCD_IMAGE set depending on the architecture?
There was a problem hiding this comment.
instead of using sed, can't you run make with
ETCD_IMAGEset depending on the architecture?
Conditional statements can be added to Makefile.defs, for example:
+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
+endifHow about you opinion on this modification?
There was a problem hiding this comment.
I was thinking on having it in ./.travis/build.sh but the conditional statement in the Makefile.defs sounds good to me as well.
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]>
iecedge
force-pushed
the
pr-travis-multi-arch
branch
from
9c0dd4e to
c56ec30
Compare
|
test-me-please |
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]
Fixes: #9898
This change is