From 57ae8ff45292734495950d68d63745f99f96d630 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 21 Aug 2015 18:05:11 -0400 Subject: [PATCH] Simplify buildtype jobs --- jobs/babeltrace.yaml | 19 ++++--------------- jobs/liburcu.yaml | 18 ++++-------------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 333c4f4..48cbaca 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -192,19 +192,6 @@ send-to-individuals: false -## Job groups -- job-group: - name: 'babeltrace_{version}_build' - buildtype: 'build' - jobs: - - 'babeltrace_{version}_{buildtype}' - -- job-group: - name: 'babeltrace_{version}_portbuild' - buildtype: 'portbuild' - jobs: - - 'babeltrace_{version}_{buildtype}' - ## Project - project: name: babeltrace @@ -212,9 +199,11 @@ - stable-1.2 - master jobs: - - 'babeltrace_{version}_build': + - 'babeltrace_{version}_{buildtype}': + buildtype: build arch: !!python/tuple [x86-32, x86-64] - - 'babeltrace_{version}_portbuild': + - 'babeltrace_{version}_{buildtype}': + buildtype: portbuild arch: !!python/tuple [armhf, powerpc] - 'babeltrace_{version}_cppcheck' - 'babeltrace_{version}_scan-build' diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index 089b057..75e554a 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -148,18 +148,6 @@ # TODO: liburcu_{version}_coverity -- job-group: - name: 'liburcu_{version}_build' - buildtype: 'build' - jobs: - - 'liburcu_{version}_{buildtype}' - -- job-group: - name: 'liburcu_{version}_portbuild' - buildtype: 'portbuild' - jobs: - - 'liburcu_{version}_{buildtype}' - ## Project - project: name: liburcu @@ -168,9 +156,11 @@ - stable-0.8 - master jobs: - - 'liburcu_{version}_build': + - 'liburcu_{version}_{buildtype}': + buildtype: build arch: !!python/tuple [x86-32, x86-64] - - 'liburcu_{version}_portbuild': + - 'liburcu_{version}_{buildtype}': + buildtype: portbuild arch: !!python/tuple [armhf, powerpc] - 'liburcu_{version}_cppcheck' - 'liburcu_{version}_scan-build' -- 2.34.1