Merge pull request #475 from xiulipan/pr/travisdivbuild

Travis CI Update Part 1. (Separate platform stage status)

Author: lgirdwood

.travis.yml

@@ -2,13 +2,45 @@ sudo: required
 
 language: c
 
+git:
+  depth: false
+
 services:
   - docker
+stages:
+  - compile
+  - test
+  - deploy
 
 before_install:
   - docker pull xiulipan/sof
 
-script:
-  - git tag -a v1.2 -m "Travis CI test"
-  - docker run -it -v `pwd`:/home/sof/work/sof.git -v `pwd`/../soft.git:/home/sof/work/soft.git --user `id -u` xiulipan/sof ./scripts/xtensa-build-all.sh -l
-  - docker run -it -v `pwd`:/home/sof/work/sof.git -v `pwd`/../soft.git:/home/sof/work/soft.git --user `id -u` xiulipan/sof ./scripts/host-build-all.sh -l
+install:
+  - docker run -it -v `pwd`:/home/sof/work/sof.git --user `id -u` xiulipan/sof ./scripts/rimage-build.sh -l
+
+jobs:
+  include:
+    - stage: compile
+      name: "BYT Build"
+      script: docker run -it -v `pwd`:/home/sof/work/sof.git --user `id -u` xiulipan/sof ./scripts/xtensa-build-all.sh -lr byt
+    - stage: compile
+      name: "BDW Build"
+      script: docker run -it -v `pwd`:/home/sof/work/sof.git --user `id -u` xiulipan/sof ./scripts/xtensa-build-all.sh -lr bdw
+    - stage: compile
+      name: "HSW Build"
+      script: docker run -it -v `pwd`:/home/sof/work/sof.git --user `id -u` xiulipan/sof ./scripts/xtensa-build-all.sh -lr hsw
+    - stage: compile
+      name: "APL Build"
+      script: docker run -it -v `pwd`:/home/sof/work/sof.git --user `id -u` xiulipan/sof ./scripts/xtensa-build-all.sh -lr apl
+    - stage: compile
+      name: "CNL Build"
+      script: docker run -it -v `pwd`:/home/sof/work/sof.git --user `id -u` xiulipan/sof ./scripts/xtensa-build-all.sh -lr cnl
+    - stage: compile
+      name: "SUE Build"
+      script: docker run -it -v `pwd`:/home/sof/work/sof.git --user `id -u` xiulipan/sof ./scripts/xtensa-build-all.sh -lr sue
+    - stage: compile
+      name: "ICL Build"
+      script: docker run -it -v `pwd`:/home/sof/work/sof.git --user `id -u` xiulipan/sof ./scripts/xtensa-build-all.sh -lr icl
+    - stage: compile
+      name: "Host Build"
+      script: docker run -it -v `pwd`:/home/sof/work/sof.git --user `id -u` xiulipan/sof ./scripts/host-build-all.sh -l

scripts/rimage-build.sh

@@ -1,6 +1,28 @@
-#!/bin/sh
+#!/bin/bash
 
 ./autogen.sh
-./configure --enable-rimage
-make
 
+pwd=`pwd`
+
+# parse the args
+for args in $@
+do
+	if [[ "$args" == "-l" ]]
+		then
+		BUILD_LOCAL=1
+	fi
+done
+
+# make sure rimage is built and aligned with code
+if [[ "x$BUILD_LOCAL" == "x" ]]
+then
+	./configure --enable-rimage
+	make
+	sudo make install
+else
+	echo "BUILD in local folder!"
+	rm -rf $pwd/local/
+	./configure --enable-rimage --prefix=$pwd/local
+	make
+	make install
+fi

scripts/xtensa-build-all.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
 SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl sue icl)
+BUILD_RIMAGE=1
+
+pwd=`pwd`
+
 if [ "$#" -eq 0 ]
 then
 	PLATFORMS=${SUPPORTED_PLATFORMS[@]}
@@ -12,6 +16,19 @@ else
 			then
 			BUILD_LOCAL=1
 
+			# build all images for chosen targets
+			if [ "$#" -eq 1 ]
+			then
+				PLATFORMS=${SUPPORTED_PLATFORMS[@]}
+				break
+			fi
+		elif [[ "$args" == "-lr" ]]
+			then
+			BUILD_LOCAL=1
+			BUILD_RIMAGE=0
+
+			PATH=$pwd/local/bin:$PATH
+
 			# build all images for chosen targets
 			if [ "$#" -eq 1 ]
 			then
@@ -40,22 +57,22 @@ set -e
 # run autogen.sh
 ./autogen.sh
 
-pwd=`pwd`
-
-
 # make sure rimage is built and aligned with code
-if [[ "x$BUILD_LOCAL" == "x" ]]
+if [[ "x$BUILD_RIMAGE" == "x1" ]]
 then
-	./configure --enable-rimage
-	make
-	sudo make install
-else
-	echo "BUILD in local folder!"
-	rm -rf $pwd/local/
-	./configure --enable-rimage --prefix=$pwd/local
-	make
-	make install
-	PATH=$pwd/local/bin:$PATH
+	if [[ "x$BUILD_LOCAL" == "x" ]]
+	then
+		./configure --enable-rimage
+		make
+		sudo make install
+	else
+		echo "BUILD in local folder!"
+		rm -rf $pwd/local/
+		./configure --enable-rimage --prefix=$pwd/local
+		make
+		make install
+		PATH=$pwd/local/bin:$PATH
+	fi
 fi
 
 OLDPATH=$PATH
@@ -151,7 +168,7 @@ do
 	fi
 
 	# update ROOT directory for xt-xcc
-	if [ $XCC == "xt-xcc" ]
+	if [ "$XCC" == "xt-xcc" ]
 	then
 		ROOT="$XTENSA_BUILDS_DIR/$XTENSA_CORE/xtensa-elf"
 		export XTENSA_SYSTEM=$XTENSA_BUILDS_DIR/$XTENSA_CORE/config