X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=6e40af06a09223dc2d3d608e14522168f96d0a1f;hb=8eb871a5c04a16d06fdb29ae14f3c5a55ed0279e;hp=ca71c3fcd1eaa42f356f8e13f77823cb47ab26be;hpb=30e5c12c8d51c154a3a4c445204152a4231c00de;p=lttng-ci.git diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index ca71c3f..6e40af0 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 @@ -332,25 +336,10 @@ condition-kind: strings-match on-evaluation-failure: run condition-string1: '${{platform}}' - condition-string2: 'msys2-mingw32' + condition-string2: 'msys2-ucrt64' steps: - inject: - properties-content: 'MSYSTEM=MINGW32' - - shell: - !include-raw-escape: - - scripts/common/msys2-shebang - - scripts/common/cygpath-prefix - - scripts/common/print.sh - - scripts/lttng-tools/build.sh - - - conditional-step: - condition-kind: strings-match - on-evaluation-failure: run - condition-string1: '${{platform}}' - condition-string2: 'msys2-mingw64' - steps: - - inject: - properties-content: 'MSYSTEM=MINGW64' + properties-content: 'MSYSTEM=UCRT64' - shell: !include-raw-escape: - scripts/common/msys2-shebang @@ -452,6 +441,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 +607,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 +631,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: @@ -718,6 +711,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 +908,7 @@ - job-template: name: lttng-tools_{version}_release defaults: lttng-tools - node: 'bionic-amd64' + node: 'deb12-amd64' triggers: - pollscm: @@ -933,13 +927,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 +966,7 @@ - job-template: name: lttng-tools_{version}_scan-build defaults: lttng-tools - node: 'bionic-amd64' + node: 'deb12-amd64' triggers: - pollscm: @@ -981,10 +975,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 +992,7 @@ - job-template: name: lttng-tools_{version}_coverity defaults: lttng-tools - node: 'bionic-amd64' + node: 'deb12-amd64' triggers: - pollscm: @@ -1018,10 +1012,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 @@ -1037,7 +1031,7 @@ - view-template: name: 'LTTng-tools' view-type: list - regex: 'lttng-tools[-_].*' + regex: 'lttng-(docs|tools)[-_].*' ## Projects @@ -1066,17 +1060,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 @@ -1125,7 +1108,7 @@ buildtype: macosbuild version: master ustversion: master - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [relayd-only] urcuversions: !!python/tuple [master] @@ -1143,10 +1126,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 +1137,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 +1179,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 @@ -1255,7 +1227,7 @@ buildtype: macosbuild version: stable-2.13 ustversion: stable-2.13 - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [relayd-only] urcuversions: !!python/tuple [stable-0.13] @@ -1273,10 +1245,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 +1256,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 +1288,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 @@ -1375,7 +1336,7 @@ buildtype: macosbuild version: stable-2.12 ustversion: stable-2.12 - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [relayd-only] urcuversions: !!python/tuple [stable-0.13] @@ -1393,10 +1354,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 +1365,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 +1498,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] @@ -1562,7 +1523,7 @@ buildtype: macosbuild version: master-staging ustversion: master - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [relayd-only] urcuversions: !!python/tuple [master] @@ -1572,10 +1533,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 +1557,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 +1591,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 +1615,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,8 +1648,8 @@ ## Master ## - 'dev_review_lttng-tools_{version}_{buildtype}': version: master - buildtype: build - platforms: !!python/tuple [bionic-amd64] + buildtype: linuxbuild + 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] # Baseline is stable-0.14 for C++ support @@ -1697,13 +1658,13 @@ 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 @@ -1731,8 +1692,8 @@ ## Stable 2.13 ## - 'dev_review_lttng-tools_{version}_{buildtype}': version: stable-2.13 - buildtype: build - platforms: !!python/tuple [bionic-amd64] + buildtype: linuxbuild + 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.13] @@ -1741,20 +1702,20 @@ 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] + buildtype: linuxbuild + 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.13] @@ -1763,13 +1724,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: @@ -1797,7 +1758,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] @@ -1805,7 +1766,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: