From 35b0474cee5f3f4aea1e2b5196c721793523a1d1 Mon Sep 17 00:00:00 2001 From: Arthur She Date: Fri, 6 Mar 2015 22:25:42 -0800 Subject: Using 'branch' statement in git-repos session to checkout specific branch of test code Change-Id: Ifacd74079b1999709e0c34d5bac7bb09891a5a7c --- ubuntu/aapits.yaml | 10 ++++++---- ubuntu/acpica.yaml | 8 +++----- ubuntu/kselftest-cpu-hotplug.yaml | 9 +++------ ubuntu/kselftest-efivarfs.yaml | 5 ++--- ubuntu/kselftest-memory-hotplug.yaml | 8 ++------ ubuntu/kselftest-mqueue.yaml | 7 ++----- ubuntu/kselftest-net.yaml | 5 ++--- ubuntu/kselftest-ptrace.yaml | 5 ++--- ubuntu/kselftest-vm.yaml | 5 ++--- ubuntu/libhugetlbfs.yaml | 17 +++++++++++++---- 10 files changed, 37 insertions(+), 42 deletions(-) (limited to 'ubuntu') diff --git a/ubuntu/aapits.yaml b/ubuntu/aapits.yaml index d3efb60..c34f978 100644 --- a/ubuntu/aapits.yaml +++ b/ubuntu/aapits.yaml @@ -15,11 +15,10 @@ metadata: install: git-repos: - - git://git.linaro.org/leg/acpica/acpica.git + - url: git://git.linaro.org/leg/acpica/acpica.git + branch: BRANCH steps: - 'cd acpica' - - 'git branch linaro origin/linaro' - - 'git checkout linaro' - 'make iasl' - 'cd tests/aapits && make all' deps: @@ -28,7 +27,10 @@ install: - bison - build-essential - make - - git + +params: + BRANCH: linaro + run: steps: - 'cd acpica/tests/aapits/bin' diff --git a/ubuntu/acpica.yaml b/ubuntu/acpica.yaml index f97f9c7..8b73955 100644 --- a/ubuntu/acpica.yaml +++ b/ubuntu/acpica.yaml @@ -17,15 +17,12 @@ metadata: install: git-repos: - - git://git.linaro.org/leg/acpica/acpica.git + - url: git://git.linaro.org/leg/acpica/acpica.git + branch: BRANCH steps: - 'cd acpica' - - 'git branch linaro origin/linaro' - - 'git checkout linaro' - 'make all' deps: - - git - - git-core - bzip2 - flex - bison @@ -33,6 +30,7 @@ install: params: TESTMODE: n64 + BRANCH: linaro run: steps: diff --git a/ubuntu/kselftest-cpu-hotplug.yaml b/ubuntu/kselftest-cpu-hotplug.yaml index 4929357..43fad17 100644 --- a/ubuntu/kselftest-cpu-hotplug.yaml +++ b/ubuntu/kselftest-cpu-hotplug.yaml @@ -19,12 +19,9 @@ metadata: install: git-repos: - - http://git.linaro.org/qa/kselftest.git - steps: - - 'cd kselftest' - - 'git checkout $BRANCH' - deps: - - git + - url: http://git.linaro.org/qa/kselftest.git + branch: BRANCH + params: BRANCH: master diff --git a/ubuntu/kselftest-efivarfs.yaml b/ubuntu/kselftest-efivarfs.yaml index 9152f91..da6abfb 100644 --- a/ubuntu/kselftest-efivarfs.yaml +++ b/ubuntu/kselftest-efivarfs.yaml @@ -19,13 +19,12 @@ metadata: install: git-repos: - - http://git.linaro.org/qa/kselftest.git + - url: http://git.linaro.org/qa/kselftest.git + branch: BRANCH steps: - 'cd kselftest' - - 'git checkout $BRANCH' - 'make -C efivarfs' deps: - - git - build-essential params: diff --git a/ubuntu/kselftest-memory-hotplug.yaml b/ubuntu/kselftest-memory-hotplug.yaml index fd8ddf9..d76641b 100644 --- a/ubuntu/kselftest-memory-hotplug.yaml +++ b/ubuntu/kselftest-memory-hotplug.yaml @@ -20,12 +20,8 @@ metadata: install: git-repos: - - http://git.linaro.org/qa/kselftest.git - steps: - - 'cd kselftest' - - 'git checkout $BRANCH' - deps: - - git + - url: http://git.linaro.org/qa/kselftest.git + branch: BRANCH params: BRANCH: master diff --git a/ubuntu/kselftest-mqueue.yaml b/ubuntu/kselftest-mqueue.yaml index 337c852..7b85bb0 100644 --- a/ubuntu/kselftest-mqueue.yaml +++ b/ubuntu/kselftest-mqueue.yaml @@ -19,12 +19,9 @@ metadata: install: git-repos: - - http://git.linaro.org/qa/kselftest.git - steps: - - 'cd kselftest' - - 'git checkout $BRANCH' + - url: http://git.linaro.org/qa/kselftest.git + branch: BRANCH deps: - - git - build-essential - wget diff --git a/ubuntu/kselftest-net.yaml b/ubuntu/kselftest-net.yaml index e13ceea..ad52e78 100644 --- a/ubuntu/kselftest-net.yaml +++ b/ubuntu/kselftest-net.yaml @@ -19,13 +19,12 @@ metadata: install: git-repos: - - http://git.linaro.org/qa/kselftest.git + - url: http://git.linaro.org/qa/kselftest.git + branch: BRANCH steps: - 'cd kselftest' - - 'git checkout $BRANCH' - 'make -C net' deps: - - git - build-essential params: diff --git a/ubuntu/kselftest-ptrace.yaml b/ubuntu/kselftest-ptrace.yaml index 199098c..7e3244c 100644 --- a/ubuntu/kselftest-ptrace.yaml +++ b/ubuntu/kselftest-ptrace.yaml @@ -20,14 +20,13 @@ metadata: install: git-repos: - - http://git.linaro.org/qa/kselftest.git + - url: http://git.linaro.org/qa/kselftest.git + branch: BRANCH steps: - 'cd kselftest' - - 'git checkout $BRANCH' - 'sed -i "1s/^/CFLAGS = -DPAGE_SIZE=4096\n/" ptrace/Makefile' - 'make -C ptrace' deps: - - git - build-essential params: diff --git a/ubuntu/kselftest-vm.yaml b/ubuntu/kselftest-vm.yaml index f6381ad..4cb1f23 100644 --- a/ubuntu/kselftest-vm.yaml +++ b/ubuntu/kselftest-vm.yaml @@ -21,13 +21,12 @@ metadata: install: git-repos: - - http://git.linaro.org/qa/kselftest.git + - url: http://git.linaro.org/qa/kselftest.git + branch: BRANCH steps: - 'cd kselftest' - - 'git checkout $BRANCH' - 'make -C vm' deps: - - git - build-essential params: diff --git a/ubuntu/libhugetlbfs.yaml b/ubuntu/libhugetlbfs.yaml index 3f5cbb7..2140349 100644 --- a/ubuntu/libhugetlbfs.yaml +++ b/ubuntu/libhugetlbfs.yaml @@ -20,21 +20,30 @@ metadata: install: git-repos: - - git://libhugetlbfs.git.sourceforge.net/gitroot/libhugetlbfs/libhugetlbfs + - url: git://libhugetlbfs.git.sourceforge.net/gitroot/libhugetlbfs/libhugetlbfs + branch: BRANCH steps: - 'cd libhugetlbfs' - - 'git checkout origin/next -b next' + - 'find . | xargs touch' - 'make' - 'mkdir -p /mnt/huge' deps: - - git - - git-core - build-essential - python - python2.7 + +params: + BRANCH: next + run: steps: - 'cd libhugetlbfs' - 'echo 200 > /proc/sys/vm/nr_hugepages' - 'mount -t hugetlbfs hugetlbfs /mnt/huge' - 'make check' + +parse: + pattern: '^(?P.+):\s+(?PFAIL|PASS)' + fixupdict: + FAIL: fail + PASS: pass -- cgit v1.2.3