X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=3fa5bfb4088e4c28d8723e1e57c23590672a94c0;hb=48c27b896fa98d43513e2bdf47ed3d84b619c7d4;hp=cf0eacb386ce2736721033ae844ca166f4fe573c;hpb=dc98b48ab638339a47b89f80bdb9a734d68b8846;p=lttng-ci.git diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index cf0eacb..3fa5bfb 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -154,6 +154,10 @@ ust_conf=std ;; esac + # Run java tests only on 'linuxbuild' jobs + if [ "{buildtype}" = "linuxbuild" ]; then + echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=yes" >> env.properties + fi echo "liburcu_conf=$liburcu_conf" >> env.properties echo "babeltrace_conf=$babeltrace_conf" >> env.properties echo "ust_conf=$ust_conf" >> env.properties @@ -452,6 +456,10 @@ + - junit: <tng-tools_publisher_junit_defaults + results: 'src/lttng-ust-java-tests/**/target/failsafe-reports/*.xml' + allow-empty-results: true + - archive: <tng-tools_publisher_archive_defaults artifacts: 'build/**,deps/**,tap/**,log/**' follow-symlinks: true @@ -614,7 +622,7 @@ triggers: - pollscm: *lttng-tools_trigger_pollscm_default - reverse: - jobs: '{ust_job_prefix}lttng-ust_{version}_build' + jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}' result: 'success' - job-template: @@ -638,7 +646,7 @@ triggers: - pollscm: *lttng-tools_trigger_pollscm_default - reverse: - jobs: '{ust_job_prefix}lttng-ust_{version}_build' + jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}' result: 'success' - job-template: @@ -676,6 +684,9 @@ - '$GERRIT_REFSPEC' basedir: src/lttng-tools skip-tag: true + # Work-around for hangs while cloning lttng-tools from gerrit + # @see https://support.efficios.com/issues/1532 + git-tool: jgit triggers: - gerrit: <tng-tools_trigger_gerrit_default @@ -718,6 +729,7 @@ - tap: *lttng-tools_publisher_tap_defaults - raw: *lttng-tools_publisher_warnings-ng_defaults + - junit: *lttng-tools_publisher_junit_defaults - archive: *lttng-tools_publisher_archive_defaults - workspace-cleanup: *lttng-tools_publisher_workspace-cleanup_defaults - raw: *lttng-tools_publisher_proc-cleaner_defaults @@ -914,7 +926,7 @@ - job-template: name: lttng-tools_{version}_release defaults: lttng-tools - node: 'bionic-amd64' + node: 'deb12-amd64' triggers: - pollscm: @@ -933,13 +945,13 @@ builders: - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults - project: 'liburcu_{urcuversion}_build/platform=bionic-amd64,conf=std,build=std' + project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std' - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults - project: 'babeltrace_{babelversion}_build/platform=bionic-amd64,conf=std,build=std' + project: 'babeltrace_{babelversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std' - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults - project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},platform=bionic-amd64,conf=agents,build=std' + project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=agents,build=std' - shell: !include-raw-escape: scripts/lttng-tools/prebuild_clean_processes_coredumps.sh - shell: @@ -972,7 +984,7 @@ - job-template: name: lttng-tools_{version}_scan-build defaults: lttng-tools - node: 'bionic-amd64' + node: 'deb12-amd64' triggers: - pollscm: @@ -981,10 +993,10 @@ builders: - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults - project: 'liburcu_{urcuversion}_build/platform=bionic-amd64,conf=std,build=std' + project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std' - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults - project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},platform=bionic-amd64,conf=std,build=std' + project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std' - shell: !include-raw-escape: scripts/common/scan-build.sh @@ -998,7 +1010,7 @@ - job-template: name: lttng-tools_{version}_coverity defaults: lttng-tools - node: 'bionic-amd64' + node: 'deb12-amd64' triggers: - pollscm: @@ -1018,10 +1030,10 @@ builders: - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults - project: 'liburcu_{urcuversion}_build/platform=bionic-amd64,conf=std,build=std' + project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std' - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults - project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},platform=bionic-amd64,conf=std,build=std' + project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std' - shell: !include-raw-escape: scripts/common/coverity.sh @@ -1066,17 +1078,6 @@ babelversions: !!python/tuple [stable-2.0, master] filter: '(build=="std") || ((babeltrace_version=="master" && (conf=="std" || conf=="agents" || conf=="no-ust")))' touchstone: '' - - '{job_prefix}lttng-tools_{version}_{buildtype}': - buildtype: build - version: master - ustversion: master - platforms: !!python/tuple [bionic-amd64] - builds: !!python/tuple [std, oot, dist] - confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback] - urcuversions: !!python/tuple [master] - babelversions: !!python/tuple [stable-2.0, master] - filter: '(build=="std") || ((babeltrace_version=="master" && (conf=="std" || conf=="agents" || conf=="no-ust")))' - touchstone: '' - '{job_prefix}lttng-tools_{version}_{buildtype}': buildtype: portbuild version: master @@ -1143,10 +1144,10 @@ filter: '' touchstone: '' - '{job_prefix}lttng-tools_{version}_long_regression': - buildtype: build + buildtype: linuxbuild version: master ustversion: master - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] urcuversions: !!python/tuple [master] @@ -1154,15 +1155,15 @@ filter: '' touchstone: '' - '{job_prefix}lttng-tools_{version}_rootbuild': - buildtype: build + buildtype: linuxbuild version: master ustversion: master - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [master] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")' + filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")' touchstone: '' - '{job_prefix}lttng-tools_{version}_rootbuild_i386': buildtype: portbuild @@ -1196,17 +1197,6 @@ babelversions: !!python/tuple [stable-2.0] filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))' touchstone: '' - - '{job_prefix}lttng-tools_{version}_{buildtype}': - buildtype: build - version: stable-2.13 - ustversion: stable-2.13 - platforms: !!python/tuple [bionic-amd64] - builds: !!python/tuple [std, oot, dist] - confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback] - urcuversions: !!python/tuple [stable-0.13] - babelversions: !!python/tuple [stable-2.0] - filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))' - touchstone: '' - '{job_prefix}lttng-tools_{version}_{buildtype}': buildtype: portbuild version: stable-2.13 @@ -1273,10 +1263,10 @@ filter: '' touchstone: '' - '{job_prefix}lttng-tools_{version}_long_regression': - buildtype: build + buildtype: linuxbuild version: stable-2.13 ustversion: stable-2.13 - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] urcuversions: !!python/tuple [stable-0.13] @@ -1284,15 +1274,15 @@ filter: '' touchstone: '' - '{job_prefix}lttng-tools_{version}_rootbuild': - buildtype: build + buildtype: linuxbuild version: stable-2.13 ustversion: stable-2.13 - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")' + filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")' touchstone: '' - 'lttng-tools_{version}_release': version: v2.13 @@ -1316,17 +1306,6 @@ babelversions: !!python/tuple [stable-2.0] filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))' touchstone: '' - - '{job_prefix}lttng-tools_{version}_{buildtype}': - buildtype: build - version: stable-2.12 - ustversion: stable-2.12 - platforms: !!python/tuple [bionic-amd64] - builds: !!python/tuple [std, oot, dist] - confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback] - urcuversions: !!python/tuple [stable-0.13] - babelversions: !!python/tuple [stable-2.0] - filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))' - touchstone: '' - '{job_prefix}lttng-tools_{version}_{buildtype}': buildtype: portbuild version: stable-2.12 @@ -1393,10 +1372,10 @@ filter: '' touchstone: '' - '{job_prefix}lttng-tools_{version}_long_regression': - buildtype: build + buildtype: linuxbuild version: stable-2.12 ustversion: stable-2.12 - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [std] urcuversions: !!python/tuple [stable-0.13] @@ -1404,15 +1383,15 @@ filter: '' touchstone: '' - '{job_prefix}lttng-tools_{version}_rootbuild': - buildtype: build + buildtype: linuxbuild version: stable-2.12 ustversion: stable-2.12 - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")' + filter: '(node=="amd64-rootnode-linux5" && platform=="deb12-amd64")' touchstone: '' - 'lttng-tools_{version}_release': version: v2.12 @@ -1537,10 +1516,10 @@ jobs: # Master - 'dev_{user}_lttng-tools_{version}_{buildtype}': - buildtype: build + buildtype: linuxbuild version: master-staging ustversion: master - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [master] @@ -1572,10 +1551,10 @@ # stable-2.13 - 'dev_{user}_lttng-tools_{version}_{buildtype}': - buildtype: build + buildtype: linuxbuild version: stable-2.13-staging ustversion: stable-2.13 - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [stable-0.13] @@ -1596,10 +1575,10 @@ # stable-2.12 - 'dev_{user}_lttng-tools_{version}_{buildtype}': - buildtype: build + buildtype: linuxbuild version: stable-2.12-staging ustversion: stable-2.12 - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [stable-0.13] @@ -1630,10 +1609,10 @@ jobs: # stable-2.11 - 'dev_{user}_lttng-tools_{version}_{buildtype}': - buildtype: build + buildtype: linuxbuild version: stable-2.11-staging ustversion: stable-2.11 - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [stable-0.11] @@ -1654,10 +1633,10 @@ # stable-2.10 - 'dev_{user}_lttng-tools_{version}_{buildtype}': - buildtype: build + buildtype: linuxbuild version: stable-2.10-staging ustversion: stable-2.10 - platforms: !!python/tuple [bionic-amd64] + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist] confs: !!python/tuple [std, no-ust, agents] urcuversions: !!python/tuple [stable-0.9] @@ -1687,33 +1666,23 @@ ## Master ## - 'dev_review_lttng-tools_{version}_{buildtype}': version: master - buildtype: build - platforms: !!python/tuple [bionic-amd64] - builds: !!python/tuple [std, oot, dist, oot-dist] - confs: !!python/tuple [std, no-ust, agents] - urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support - babelversions: !!python/tuple [stable-2.0] - filter: '' - touchstone: '' - - 'dev_review_lttng-tools_{version}_{buildtype}': buildtype: linuxbuild - version: master platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std, oot, dist, oot-dist] confs: !!python/tuple [std, no-ust, agents] - urcuversions: !!python/tuple [stable-0.14] + urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support babelversions: !!python/tuple [stable-2.0] filter: '' touchstone: '' - 'dev_review_lttng-tools_{version}_rootbuild': version: master - buildtype: build - platforms: !!python/tuple [bionic-amd64] + buildtype: linuxbuild + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")' + filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")' touchstone: '' - 'dev_review_lttng-tools_{version}_smokebuild': version: master @@ -1739,16 +1708,6 @@ version: master ## Stable 2.13 ## - - 'dev_review_lttng-tools_{version}_{buildtype}': - version: stable-2.13 - buildtype: build - platforms: !!python/tuple [bionic-amd64] - builds: !!python/tuple [std, oot, dist, oot-dist] - confs: !!python/tuple [std, no-ust, agents] - urcuversions: !!python/tuple [stable-0.13] - babelversions: !!python/tuple [stable-2.0] - filter: '' - touchstone: '' - 'dev_review_lttng-tools_{version}_{buildtype}': version: stable-2.13 buildtype: linuxbuild @@ -1761,26 +1720,16 @@ touchstone: '' - 'dev_review_lttng-tools_{version}_rootbuild': version: stable-2.13 - buildtype: build - platforms: !!python/tuple [bionic-amd64] + buildtype: linuxbuild + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")' + filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")' touchstone: '' ## Stable 2.12 ## - - 'dev_review_lttng-tools_{version}_{buildtype}': - version: stable-2.12 - buildtype: build - platforms: !!python/tuple [bionic-amd64] - builds: !!python/tuple [std, oot, dist, oot-dist] - confs: !!python/tuple [std, no-ust, agents] - urcuversions: !!python/tuple [stable-0.13] - babelversions: !!python/tuple [stable-2.0] - filter: '' - touchstone: '' - 'dev_review_lttng-tools_{version}_{buildtype}': version: stable-2.12 buildtype: linuxbuild @@ -1793,13 +1742,13 @@ touchstone: '' - 'dev_review_lttng-tools_{version}_rootbuild': version: stable-2.12 - buildtype: build - platforms: !!python/tuple [bionic-amd64] + buildtype: linuxbuild + platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")' + filter: '(node=="amd64-rootnode-linux5" && platform=="deb12-amd64")' touchstone: '' - project: @@ -1827,7 +1776,7 @@ touchstone: '' - '{job_prefix}lttng-tools_{version}_rootbuild': version: master - buildtype: build + buildtype: linuxbuild ustversion: master platforms: !!python/tuple [deb12-amd64] builds: !!python/tuple [std] @@ -1835,7 +1784,7 @@ urcuversions: !!python/tuple [master] ustversion: master babelversions: !!python/tuple [master] - filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")' + filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")' touchstone: '' - project: