X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=931e274e68e64510d80dd0b81fd49b3de06cf42c;hb=0ecb76529f15cf5935ac7179f42c1b2ecb15d6fe;hp=517889b8c5e3c6c3518c3c542b681ec070822a8c;hpb=3b228cdd0941928e4221f7fd5ea8fcca2ad4fcfd;p=lttng-ci.git
diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 517889b..931e274 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -61,10 +61,10 @@
expr: '{touchstone}'
result: unstable
axes:
- - axis: &babeltrace_matrix_axis_arch
+ - axis: &babeltrace_matrix_axis_platform
type: slave
- name: arch
- values: '{obj:archs}'
+ name: platform
+ values: '{obj:platforms}'
- axis: &babeltrace_matrix_axis_conf
type: user-defined
name: conf
@@ -80,7 +80,7 @@
<<: *babeltrace_matrix_axes_defaults
axes:
- - axis: *babeltrace_matrix_axis_arch
+ - axis: *babeltrace_matrix_axis_platform
- axis: *babeltrace_matrix_axis_conf
- axis: *babeltrace_matrix_axis_build
- axis: &babeltrace_matrix_axis_cc
@@ -96,7 +96,7 @@
- conditional-step:
condition-kind: strings-match
on-evaluation-failure: run
- condition-string1: {{ '${{arch}}' }}
+ condition-string1: {{ '${{platform}}' }}
condition-string2: 'cygwin64'
steps:
- shell:
@@ -108,7 +108,7 @@
- conditional-step:
condition-kind: strings-match
on-evaluation-failure: run
- condition-string1: {{ '${{arch}}' }}
+ condition-string1: {{ '${{platform}}' }}
condition-string2: 'msys2-mingw32'
steps:
- inject:
@@ -122,7 +122,7 @@
- conditional-step:
condition-kind: strings-match
on-evaluation-failure: run
- condition-string1: {{ '${{arch}}' }}
+ condition-string1: {{ '${{platform}}' }}
condition-string2: 'msys2-mingw64'
steps:
- inject:
@@ -148,7 +148,7 @@
properties-content: |
LD_LIBRARY_PATH=$WORKSPACE/glib-2.28.6/BUILD_RESULT/lib
PKG_CONFIG_PATH=$WORKSPACE/glib-2.28.6/BUILD_RESULT/lib/pkgconfig
- arch=amd64
+ platform=bionic-amd64
conf=std
build=std
- shell: |
@@ -171,6 +171,8 @@
results: 'tap/**/*.log'
fail-if-no-results: true
failed-tests-mark-build-as-failure: true
+ include-comment-diagnostics: true
+ output-tap-to-console: false
todo-is-failure: false
- raw: &babeltrace_publisher_warnings-ng_defaults
xml: |
@@ -184,14 +186,6 @@
false
-
-
-
-
-
-
- false
-
@@ -221,7 +215,7 @@
- archive: &babeltrace_publisher_archive_defaults
- artifacts: 'build/**,tap/**'
+ artifacts: 'build/**,tap/**,log/**'
allow-empty: false
- workspace-cleanup: &babeltrace_publisher_workspace-cleanup_defaults
clean-if:
@@ -266,14 +260,6 @@
false
-
-
-
-
-
-
- false
-
@@ -369,7 +355,7 @@
- job-template:
name: babeltrace_{version}_release
defaults: babeltrace
- node: 'amd64'
+ node: 'bionic-amd64'
triggers:
- pollscm:
@@ -396,6 +382,7 @@
- archive:
artifacts: 'out/**,tap/**'
allow-empty: false
+ fingerprint: true
- job-template:
name: dev_gerrit_babeltrace_pylint
@@ -424,7 +411,7 @@
- branch-compare-type: 'ANT'
branch-pattern: '**'
- node: 'amd64'
+ node: 'bionic-amd64'
builders:
- shell:
@@ -437,31 +424,10 @@
- build-discarder:
days-to-keep: 1
-- job-template:
- name: babeltrace_{version}_cppcheck
- defaults: babeltrace
-
- triggers:
- - pollscm:
- cron: "@daily"
-
- builders:
- - shell: |
- rm -f cppcheck-result.xml
- cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/babeltrace 2> cppcheck-result.xml
-
- publishers:
- - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults
- - archive:
- artifacts: 'cppcheck-result.xml'
- allow-empty: false
- - cppcheck:
- pattern: 'cppcheck-result.xml'
-
- job-template:
name: babeltrace_{version}_scan-build
defaults: babeltrace
- node: 'amd64'
+ node: 'bionic-amd64'
triggers:
- pollscm:
@@ -481,7 +447,7 @@
- job-template:
name: babeltrace_{version}_coverity
defaults: babeltrace
- node: 'amd64'
+ node: 'bionic-amd64'
triggers:
- pollscm:
@@ -511,7 +477,7 @@
- job-template:
name: babeltrace_{version}_pylint
defaults: babeltrace
- node: 'amd64'
+ node: 'bionic-amd64'
triggers:
- pollscm:
@@ -531,7 +497,7 @@
- job-template:
name: '{job_prefix}babeltrace_{version}_glib-2.28.6'
defaults: babeltrace
- node: 'amd64'
+ node: 'bionic-amd64'
<<: *babeltrace_builders_glib-2-28-6
<<: *babeltrace_publishers_defaults
@@ -555,58 +521,72 @@
- stable-2.0
- master
jobs:
+ - '{job_prefix}babeltrace_{version}_{buildtype}':
+ buildtype: linuxbuild
+ platforms: !!python/tuple [jammy-amd64]
+ builds: !!python/tuple [std, oot, dist, oot-dist]
+ confs: !!python/tuple [std, static, prod, min, doc, asan]
+ filter: '(build=="std") || (conf=="std") || (conf=="doc")'
+ touchstone: '(build == "std") && (conf == "std")'
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: build
- archs: !!python/tuple [amd64]
+ platforms: !!python/tuple [bionic-amd64]
builds: !!python/tuple [std, oot, dist, oot-dist]
- confs: !!python/tuple [std, static, prod, min, doc]
- filter: ''
+ confs: !!python/tuple [std, static, prod, min, doc, asan]
+ filter: '(build=="std") || (conf=="std") || (conf=="doc")'
touchstone: '(build == "std") && (conf == "std")'
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: portbuild
- archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+ platforms: !!python/tuple [deb11-armhf, deb11-arm64, deb11-ppc64el, deb11-i386]
builds: !!python/tuple [std]
confs: !!python/tuple [std, prod]
filter: ''
- touchstone: '(build == "std") && (conf == "std") && (arch == "i386")'
+ touchstone: '(build == "std") && (conf == "std") && (platform == "deb11-i386")'
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: slesbuild
- archs: !!python/tuple [sles12sp5]
+ platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
builds: !!python/tuple [std]
confs: !!python/tuple [std, prod]
filter: ''
touchstone: ''
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: elbuild
- archs: !!python/tuple [el7, el8, el9]
+ platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
builds: !!python/tuple [std]
confs: !!python/tuple [std, prod]
filter: ''
touchstone: ''
+ - '{job_prefix}babeltrace_{version}_{buildtype}':
+ buildtype: yoctobuild
+ platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
+ builds: !!python/tuple [std]
+ confs: !!python/tuple [std]
+ filter: ''
+ touchstone: ''
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: macosbuild
- archs: !!python/tuple [macos-amd64, macos-arm64]
+ platforms: !!python/tuple [macos-amd64, macos-arm64]
builds: !!python/tuple [std]
confs: !!python/tuple [std, prod]
filter: ''
touchstone: ''
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: freebsdbuild
- archs: !!python/tuple [freebsd]
+ platforms: !!python/tuple [freebsd-amd64]
builds: !!python/tuple [std]
confs: !!python/tuple [std, prod]
filter: ''
touchstone: ''
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: winbuild
- archs: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64]
+ platforms: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64]
builds: !!python/tuple [std]
confs: !!python/tuple [std]
filter: ''
touchstone: ''
- 'babeltrace_{version}_{cctype}':
cctype: clangbuild
- archs: !!python/tuple [amd64]
+ platforms: !!python/tuple [bionic-amd64]
builds: !!python/tuple [std]
confs: !!python/tuple [std, static, prod]
ccs: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7]
@@ -614,7 +594,6 @@
touchstone: ''
- 'babeltrace_{version}_release':
version: v2.0
- - 'babeltrace_{version}_cppcheck'
- 'babeltrace_{version}_scan-build'
- 'babeltrace_{version}_pylint'
- 'babeltrace_{version}_coverity':
@@ -630,21 +609,21 @@
jobs:
- 'dev_gerrit_babeltrace_{buildtype}':
buildtype: build
- archs: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386]
+ platforms: !!python/tuple [bionic-amd64, deb11-armhf, deb11-arm64, deb11-ppc64el, deb11-i386]
builds: !!python/tuple [std, oot, dist, oot-dist]
confs: !!python/tuple [std, static, prod, min]
- filter: '(build=="std" && conf=="std") || (arch=="amd64")'
+ filter: '(build=="std" && conf=="std") || (platform=="bionic-amd64")'
touchstone: ''
- 'dev_gerrit_babeltrace_{buildtype}':
buildtype: macosbuild
- archs: !!python/tuple [macos-amd64, macos-arm64]
+ platforms: !!python/tuple [macos-amd64, macos-arm64]
builds: !!python/tuple [std]
confs: !!python/tuple [std, prod]
filter: ''
touchstone: ''
- 'dev_gerrit_babeltrace_{buildtype}':
buildtype: winbuild
- archs: !!python/tuple [cygwin64, msys2-mingw64]
+ platforms: !!python/tuple [cygwin64, msys2-mingw64]
builds: !!python/tuple [std]
confs: !!python/tuple [std]
filter: ''
@@ -662,33 +641,35 @@
- stable-1.5
jobs:
- '{job_prefix}babeltrace_{version}_{buildtype}':
- buildtype: build
- archs: !!python/tuple [amd64]
+ buildtype: linuxbuild
+ platforms: !!python/tuple [jammy-amd64]
builds: !!python/tuple [std, oot, dist, oot-dist]
confs: !!python/tuple [std, static, python-bindings]
filter: ''
touchstone: '(build == "std") && (conf == "std")'
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: portbuild
- archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+ platforms: !!python/tuple [deb11-armhf, deb11-arm64, deb11-ppc64el, deb11-i386]
builds: !!python/tuple [std]
confs: !!python/tuple [std, python-bindings]
filter: ''
- touchstone: '(build == "std") && (conf == "std") && (arch == "i386")'
+ touchstone: '(build == "std") && (conf == "std") && (platform == "deb11-i386")'
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: slesbuild
- archs: !!python/tuple [sles12sp5]
+ platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
builds: !!python/tuple [std]
confs: !!python/tuple [std]
filter: ''
touchstone: ''
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: elbuild
- archs: !!python/tuple [el7, el8, el9]
+ platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
builds: !!python/tuple [std]
confs: !!python/tuple [std]
filter: ''
touchstone: ''
+ - 'babeltrace_{version}_release':
+ version: v1.5
- project:
@@ -702,14 +683,14 @@
jobs:
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: build
- archs: !!python/tuple [amd64]
+ platforms: !!python/tuple [bionic-amd64]
builds: !!python/tuple [std, oot, dist, oot-dist]
confs: !!python/tuple [std, static, python-bindings]
filter: ''
touchstone: ''
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: macosbuild
- archs: !!python/tuple [macos-amd64, macos-arm64]
+ platforms: !!python/tuple [macos-amd64, macos-arm64]
builds: !!python/tuple [std]
confs: !!python/tuple [std]
filter: ''
@@ -731,14 +712,14 @@
- master-staging
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: build
- archs: !!python/tuple [amd64]
+ platforms: !!python/tuple [bionic-amd64]
builds: !!python/tuple [std, oot, dist, oot-dist]
confs: !!python/tuple [std, static, prod, min]
filter: ''
touchstone: ''
- '{job_prefix}babeltrace_{version}_{buildtype}':
buildtype: macosbuild
- archs: !!python/tuple [macos-amd64, macos-arm64]
+ platforms: !!python/tuple [macos-amd64, macos-arm64]
builds: !!python/tuple [std]
confs: !!python/tuple [std, prod]
filter: ''