We use CircleCI for the tests, which should check regressions before
merging.
Signed-off-by: Hajime Tazaki <thehajime@xxxxxxxxx>
---
.circleci/config.yml | 274 +++++++++++++++++++++++++++++++
tools/lkl/scripts/checkpatch.sh | 60 +++++++
tools/lkl/scripts/lkl-jenkins.sh | 21 +++
3 files changed, 355 insertions(+)
create mode 100644 .circleci/config.yml
create mode 100755 tools/lkl/scripts/checkpatch.sh
create mode 100755 tools/lkl/scripts/lkl-jenkins.sh
diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000000..5c7b2fbad703
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,274 @@
+version: 2
+general:
+ artifacts:
+
+do_steps: &do_steps
+ steps:
+ - run: echo "$CROSS_COMPILE" > ~/_cross_compile
+ - restore_cache:
+ key: code-tree-shallow-{{ .Environment.CACHE_VERSION }}
+ - run:
+ name: checkout build tree
+ command: |
+ mkdir -p ~/.ssh/
+ ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+ if ! [ -d .git ]; then
+ git clone --depth=1 $CIRCLE_REPOSITORY_URL .;
+ fi
+ if [[ $CIRCLE_BRANCH == pull/* ]]; then
+ git fetch --depth=1 origin $CIRCLE_BRANCH/head;
+ else
+ git fetch --depth=1 origin $CIRCLE_BRANCH;
+ fi
+ git reset --hard $CIRCLE_SHA1
+ - save_cache:
+ key: code-tree-shallow-{{ .Environment.CACHE_VERSION }}-{{ epoch }}
+ paths:
+ - /home/ubuntu/project/.git
+ - run:
+ name: clean
+ command: |
+ make mrproper
+ cd tools/lkl && make clean-conf
+ rm -rf ~/junit
+ - run: mkdir -p /home/ubuntu/.ccache
+ - restore_cache:
+ key: compiler-cache-{{ checksum "~/_cross_compile" }}-{{ .Environment.CACHE_VERSION }}
+ - run:
+ name: build DPDK
+ command: |
+ if [ "$MKARG" = "dpdk=yes" ]; then
+ sudo apt-get update
+ if ! sudo apt-get install -y linux-headers-$(uname -r) ; then
+ cd /lib/modules && sudo ln -sf 4.4.0-97-generic `uname -r` && \
+ cd /home/ubuntu/project
+ fi
+ cd tools/lkl && ./scripts/dpdk-sdk-build.sh;
+ fi
+ - run:
+ name: copy mingw binutils
+ command: |
+ if [ "$CROSS_COMPILE" = "i686-w64-mingw32-" ]; then
+ wget https://github.com/lkl/linux/raw/master/tools/lkl/bin/i686-w64-mingw32-as
+ wget https://github.com/lkl/linux/raw/master/tools/lkl/bin/i686-w64-mingw32-ld
+ wget https://github.com/lkl/linux/raw/master/tools/lkl/bin/i686-w64-mingw32-objcopy
+ sudo cp i686-w64-mingw32-* /usr/bin;
+ elif [ "$CROSS_COMPILE" = "arm-linux-androideabi-" ]; then
+ wget https://github.com/lkl/linux/raw/master/tools/lkl/bin/arm-linux-androideabi-ld.gold
+ sudo cp arm-linux-androideabi-ld.gold /usr/bin/arm-linux-androideabi-ld;
+ fi
+ - run:
+ name: start emulator
+ command: |
+ if [[ $CROSS_COMPILE == *android* ]]; then
+ emulator -avd Nexus5_API24 -no-window -no-audio -no-boot-anim;
+ elif [[ $CROSS_COMPILE == *freebsd* ]]; then
+ cd /home/ubuntu && $QEMU
+ fi
+ background: true
+ - run: cd tools/lkl && make -j8 ${MKARG}
+ - run: mkdir -p ~/destdir && cd tools/lkl && make DESTDIR=~/destdir
+ - save_cache:
+ paths:
+ - /home/ubuntu/.ccache
+ key: compiler-cache-{{ checksum "~/_cross_compile" }}-{{ .Environment.CACHE_VERSION }}-{{ epoch }}
+ - run:
+ name: wait emulator to boot
+ command: |
+ if [[ $CROSS_COMPILE == *android* ]]; then
+ /home/ubuntu/circle-android.sh wait-for-boot;
+ elif [[ $CROSS_COMPILE == *freebsd* ]]; then
+ while ! $MYSSH -o ConnectTimeout=1 exit 2> /dev/null
+ do
+ sleep 5
+ done
+ fi
+ - run:
+ name: run tests
+ command: |
+ mkdir -p ~/junit
+ make -C tools/lkl run-tests tests="--junit-dir ~/junit"
+ find ./tools/lkl/ -type f -name "*.xml" -exec mv {} ~/junit/ \;
+ no_output_timeout: "90m"
+ - store_test_results:
+ path: ~/junit
+ - store_artifacts:
+ path: ~/junit
+
+
+do_uml_steps: &do_uml_steps
+ steps:
+ - run: echo "$CROSS_COMPILE" > ~/_cross_compile
+ - restore_cache:
+ key: code-tree-shallow-{{ .Environment.CACHE_VERSION }}
+ - run:
+ name: checkout build tree
+ command: |
+ mkdir -p ~/.ssh/
+ ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+ if ! [ -d .git ]; then
+ git clone --depth=1 $CIRCLE_REPOSITORY_URL .;
+ fi
+ if [[ $CIRCLE_BRANCH == pull/* ]]; then
+ git fetch --depth=1 origin $CIRCLE_BRANCH/head;
+ else
+ git fetch --depth=1 origin $CIRCLE_BRANCH;
+ fi
+ git reset --hard $CIRCLE_SHA1
+ - save_cache:
+ key: code-tree-shallow-{{ .Environment.CACHE_VERSION }}-{{ epoch }}
+ paths:
+ - /home/ubuntu/project/.git
+ - run: mkdir -p /home/ubuntu/.ccache
+ - restore_cache:
+ key: compiler-cache-{{ checksum "~/_cross_compile" }}-{{ .Environment.CACHE_VERSION }}
+ - run:
+ name: build
+ command: |
+ sudo apt-get update
+ sudo apt-get install -y gcc-multilib g++-multilib
+ make -C tools/lkl/
+ make defconfig ARCH=um SUBARCH=$SUBARCH
+ make ARCH=um SUBARCH=$SUBARCH
+ - save_cache:
+ paths:
+ - /home/ubuntu/.ccache
+ key: compiler-cache-{{ checksum "~/_cross_compile" }}-{{ .Environment.CACHE_VERSION }}-{{ epoch }}
+ - run:
+ name: test
+ command: |
+ # XXX: i386 build doesn't work with the test
+ if [ $CIRCLE_STAGE = "i386_uml" ] || [ $CIRCLE_STAGE = "i386_uml_on_x86_64" ]; then
+ exit 0
+ fi
+ ./linux rootfstype=hostfs ro mem=1g loglevel=10 init="/bin/bash -c exit" || export RETVAL=$?
+ # SIGABRT=6 => 128+6
+ if [ $RETVAL != "134" ]; then
+ exit 1
+ fi
+
+## Customize the test machine
+jobs:
+ x86_64:
+ docker:
+ - image: lkldocker/circleci-x86_64:0.7
+ environment:
+ CROSS_COMPILE: ""
+ MKARG: "dpdk=no"
+ <<: *do_steps
+
+ i386:
+ docker:
+ - image: lkldocker/circleci-i386:0.1
+ environment:
+ CROSS_COMPILE: ""
+ <<: *do_steps
+
+ mingw32:
+ docker:
+ - image: lkldocker/circleci-mingw:0.6
+ environment:
+ CROSS_COMPILE: "i686-w64-mingw32-"
+ <<: *do_steps
+
+ android-arm32:
+ docker:
+ - image: lkldocker/circleci-android-arm32:0.6
+ environment:
+ CROSS_COMPILE: "arm-linux-androideabi-"
+ LKL_ANDROID_TEST: 1
+ ANDROID_SDK_ROOT: /home/ubuntu/android-sdk
+ <<: *do_steps
+
+ android-aarch64:
+ docker:
+ - image: lkldocker/circleci-android-arm64:0.6
+ environment:
+ CROSS_COMPILE: "aarch64-linux-android-"
+ LKL_ANDROID_TEST: 1
+ ANDROID_SDK_ROOT: /home/ubuntu/android-sdk
+ <<: *do_steps
+
+ freebsd11_x86_64:
+ docker:
+ - image: lkldocker/circleci-freebsd11-x86_64:0.4
+ environment:
+ CROSS_COMPILE: "x86_64-pc-freebsd11-"
+ <<: *do_steps
+
+ x86_64_valgrind:
+ docker:
+ - image: lkldocker/circleci-x86_64:0.7
+ environment:
+ CROSS_COMPILE: ""
+ MKARG: "dpdk=no"
+ VALGRIND: 1
+ <<: *do_steps
+
+ x86_64_uml:
+ docker:
+ - image: lkldocker/circleci-x86_64:0.7
+ environment:
+ CROSS_COMPILE: ""
+ TMPDIR: "/tmp" # required for not using /dev/shm
+ SUBARCH: "x86_64"
+ <<: *do_uml_steps
+
+ i386_uml:
+ docker:
+ - image: lkldocker/circleci-i386:0.1
+ environment:
+ CROSS_COMPILE: ""
+ SUBARCH: "i386"
+ TMPDIR: "/tmp" # required for not using /dev/shm
+ <<: *do_uml_steps
+
+ i386_uml_on_x86_64:
+ docker:
+ - image: lkldocker/circleci-x86_64:0.7
+ environment:
+ CROSS_COMPILE: ""
+ TMPDIR: "/tmp" # required for not using /dev/shm
+ SUBARCH: "i386"
+ <<: *do_uml_steps
+
+ checkpatch:
+ docker:
+ - image: lkldocker/circleci:0.5
+ environment:
+ steps:
+ - restore_cache:
+ key: code-tree-full-history-{{ .Environment.CACHE_VERSION }}
+ - checkout
+ - run: sudo pip install ply
+ - run: tools/lkl/scripts/checkpatch.sh
+ - save_cache:
+ key: code-tree-full-history-{{ .Environment.CACHE_VERSION }}-{{ epoch }}
+ paths:
+ - /home/ubuntu/project/.git
+ when: always
+
+workflows:
+ version: 2
+ build:
+ jobs:
+ - x86_64
+ - mingw32
+ - android-arm32
+ - android-aarch64
+ - freebsd11_x86_64
+ - checkpatch
+ - i386
+ - x86_64_uml
+ - i386_uml
+ - i386_uml_on_x86_64
+ nightly:
+ triggers:
+ - schedule:
+ cron: "0 0 * * *"
+ filters:
+ branches:
+ only:
+ - master
+ jobs:
+ - x86_64_valgrind
diff --git a/tools/lkl/scripts/checkpatch.sh b/tools/lkl/scripts/checkpatch.sh
new file mode 100755
index 000000000000..0c02ca6b21a2
--- /dev/null
+++ b/tools/lkl/scripts/checkpatch.sh
@@ -0,0 +1,60 @@
+#!/bin/sh -ex
+# SPDX-License-Identifier: GPL-2.0
+
+if [ -z "$origin_master" ]; then
+ origin_master="origin/master"
+fi
+
+UPSTREAM=git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+LKL=github.com:lkl/linux.git
+
+upstream=`git remote -v | grep $UPSTREAM | cut -f1 | head -n1`
+lkl=`git remote -v | grep $LKL | cut -f1 | head -n1`
+
+if [ -z "$upstream" ]; then
+ git fetch --tags --progress git://$UPSTREAM
+else
+ git fetch --tags $upstream
+fi
+
+if [ -z "$lkl" ]; then
+ git remote add lkl-upstream git@$LKL || true
+ lkl=`git remote -v | grep $LKL | cut -f1 | head -n1`
+fi
+
+if [ -z "$lkl" ]; then
+ echo "can't find lkl remote, quiting"
+ exit 1
+fi
+
+git fetch $lkl
+git fetch --tags $upstream
+
+# find the last upstream tag to avoid checking upstream commits during
+# upstream merges
+tag=`git tag --sort='-*authordate' | grep ^v | head -n1`
+tmp=`mktemp -d`
+
+commits=$(git log --no-merges --pretty=format:%h HEAD ^$lkl/master ^$tag)
+for c in $commits; do
+ git format-patch -1 -o $tmp $c
+done
+
+if [ -z "$c" ]; then
+ echo "there are not commits/patches to check, quiting."
+ rmdir $tmp
+ exit 0
+fi
+
+./scripts/checkpatch.pl --ignore FILE_PATH_CHANGES $tmp/*.patch
+rm $tmp/*.patch
+
+# checkpatch.pl does not know how to deal with 3 way diffs which would
+# be useful to check the conflict resolutions during merges...
+#for c in `git log --merges --pretty=format:%h HEAD ^$origin_master ^$tag`; do
+# git log --pretty=email $c -1 > $tmp/$c.patch
+# git diff $c $c^1 $c^2 >> $tmp/$c.patch
+#done
+
+rmdir $tmp
+
diff --git a/tools/lkl/scripts/lkl-jenkins.sh b/tools/lkl/scripts/lkl-jenkins.sh
new file mode 100755
index 000000000000..eaadc6e90143
--- /dev/null
+++ b/tools/lkl/scripts/lkl-jenkins.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+set -e
+
+script_dir=$(cd $(dirname ${BASH_SOURCE:-$0}); pwd)
+basedir=$(cd $script_dir/../../..; pwd)
+
+export PATH=$PATH:/sbin
+
+build_and_test()
+{
+ cd $basedir
+ make mrproper
+ cd tools/lkl
+ make clean-conf
+ make -j4
+ make run-tests
+}
+
+build_and_test
--
2.20.1 (Apple Git-117)
