Simplify buildtype jobs

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 333c4f4cd267fc346cdee66d0d9ce854f53bed41..48cbacaf946fe71382f88cccdbdc4814ac5d8775 100644 (file)
--- 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 089b057652891bacdf06b8e95ec9e217d9430047..75e554acdeeff5503b6500827830d9ee5aa317bd 100644 (file)
--- 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'