X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=2f86a38fac9f516d0c44e7b031ceb9f51a2a8eb7;hb=9c9b6b2058536b4cbe7bc433059fc27fc07b6060;hp=06c6a538dd586ecb75205bbf32e93d320558c7d0;hpb=9a269c66154080f85e83433b86fdacec726d6865;p=lttng-ci.git diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index 06c6a53..2f86a38 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -111,11 +111,7 @@ - axis: type: slave name: node - values: - - 'amd64-rootnode' - - 'el8-amd64-rootnode' - - 'i386-rootnode' - - 'sles15sp4-amd64-rootnode' + values: '{obj:nodes}' - axis: <<: *lttng-tools_matrix_axis_platform type: user-defined @@ -163,6 +159,7 @@ fi if [ "{buildtype}" = "slesbuild" ] ; then echo "TAP_AUTOTIME=0" >> env.properties + echo "LTTNG_TESTS_TAP_AUTOTIME=0" >> env.properties # On SLES, force log4j to 2.17.1 echo "LTTNG_TOOLS_UST_JAVA_TESTS_LOG4J_API_VERSION=2.17.1" >> env.properties fi @@ -229,6 +226,7 @@ fi if [ "{buildtype}" = "slesbuild" ] ; then echo "TAP_AUTOTIME=0" >> env.properties + echo "LTTNG_TESTS_TAP_AUTOTIME=0" >> env.properties fi - inject: properties-file: env.properties @@ -242,7 +240,7 @@ - conditional-step: condition-kind: regex-match label: '$JOB_NAME' - regex: '.*_rootbuild.*' + regex: '.*_root(?:_[a-z]+)?build.*' steps: - shell: | #!/bin/bash @@ -609,54 +607,6 @@ jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}' result: 'success' -- job-template: - name: '{job_prefix}lttng-tools_{version}_rootbuild' - defaults: lttng-tools - - scm: - - git: *lttng-tools_scm_git_default - - wrappers: - - ansicolor: *lttng-tools_wrapper_ansicolor_defaults - - timeout: - <<: *lttng-tools_wrapper_timeout_defaults - timeout: 10 - - timestamps - - <<: *lttng-tools_matrix_axes_rootbuild - <<: *lttng-tools_builders_defaults - <<: *lttng-tools_publishers_rootbuild - - triggers: - - pollscm: *lttng-tools_trigger_pollscm_default - - reverse: - jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}' - result: 'success' - -- job-template: - name: '{job_prefix}lttng-tools_{version}_rootbuild_i386' - defaults: lttng-tools - - scm: - - git: *lttng-tools_scm_git_default - - wrappers: - - ansicolor: *lttng-tools_wrapper_ansicolor_defaults - - timeout: - <<: *lttng-tools_wrapper_timeout_defaults - timeout: 10 - - timestamps - - <<: *lttng-tools_matrix_axes_rootbuild - <<: *lttng-tools_builders_defaults - <<: *lttng-tools_publishers_rootbuild - - triggers: - - pollscm: *lttng-tools_trigger_pollscm_default - - reverse: - jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}' - result: 'success' - - job-template: name: '{job_prefix}lttng-tools_{version}_root_{buildtype}' defaults: lttng-tools @@ -895,35 +845,6 @@ - workspace-cleanup: *lttng-tools_publisher_workspace-cleanup_defaults - raw: *lttng-tools_publisher_proc-cleaner_defaults -- job-template: - name: dev_review_lttng-tools_{version}_rootbuild - defaults: lttng-tools - concurrent: true - - scm: - - git: *lttng-tools_scm_git_review - - triggers: - - gerrit: *lttng-tools_trigger_gerrit_default - - properties: - - inject: *lttng-tools_property_inject_defaults - - build-discarder: - days-to-keep: 1 - - throttle: - option: 'category' - categories: - - 'gerrit-{buildtype}' - - <<: *lttng-tools_matrix_axes_rootbuild - <<: *lttng-tools_builders_review - - publishers: - - tap: *lttng-tools_publisher_tap_defaults - - raw: *lttng-tools_publisher_warnings-ng_defaults - - archive: *lttng-tools_publisher_archive_defaults - - workspace-cleanup: *lttng-tools_publisher_workspace-cleanup_defaults - - job-template: name: 'dev_review_lttng-tools_{version}_root_{buildtype}' defaults: lttng-tools @@ -1052,6 +973,9 @@ - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std' + - copyartifact: + <<: *lttng-tools_steps_copyartifact_defaults + project: 'babeltrace_{babelversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std' - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std' @@ -1089,6 +1013,9 @@ - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std' + - copyartifact: + <<: *lttng-tools_steps_copyartifact_defaults + project: 'babeltrace_{babelversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std' - copyartifact: <<: *lttng-tools_steps_copyartifact_defaults project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std' @@ -1212,22 +1139,36 @@ babelversions: !!python/tuple [stable-2.0] filter: '' touchstone: '' - - '{job_prefix}lttng-tools_{version}_rootbuild': + - '{job_prefix}lttng-tools_{version}_root_{buildtype}': buildtype: linuxbuild version: master ustversion: master platforms: !!python/tuple [deb12-amd64] + nodes: !!python/tuple [deb12-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [master] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")' + filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")' + touchstone: '' + - '{job_prefix}lttng-tools_{version}_root_{buildtype}': + buildtype: portbuild + version: master + ustversion: master + platforms: !!python/tuple [deb12-i386, deb12-armhf, deb12-arm64] + nodes: !!python/tuple [deb12-i386-rootnode, deb12-armhf-rootnode, deb12-arm64-rootnode] + builds: !!python/tuple [std] + confs: !!python/tuple [agents] + urcuversions: !!python/tuple [master] + babelversions: !!python/tuple [stable-2.0] + filter: '((node=="deb12-i386-rootnode" && platform=="deb12-i386") || (node=="deb12-armhf-rootnode" && platform=="deb12-armhf") || (node=="deb12-arm64-rootnode" && platform=="deb12-arm64"))' touchstone: '' - '{job_prefix}lttng-tools_{version}_root_{buildtype}': buildtype: slesbuild version: master ustversion: master platforms: !!python/tuple [sles15sp4-amd64] + nodes: !!python/tuple [sles15sp4-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [master] @@ -1239,31 +1180,23 @@ version: master ustversion: master platforms: !!python/tuple [el8-amd64] + nodes: !!python/tuple [el8-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [std] urcuversions: !!python/tuple [master] babelversions: !!python/tuple [stable-2.0] filter: '(node=="el8-amd64-rootnode" && platform=="el8-amd64")' touchstone: '' - - '{job_prefix}lttng-tools_{version}_rootbuild_i386': - buildtype: portbuild - version: master - ustversion: master - platforms: !!python/tuple [deb12-i386] - builds: !!python/tuple [std] - confs: !!python/tuple [agents] - urcuversions: !!python/tuple [master] - babelversions: !!python/tuple [stable-2.0] - filter: '(node=="i386-rootnode" && platform=="deb12-i386")' - touchstone: '' - 'lttng-tools_{version}_scan-build': version: master urcuversion: master ustversion: master + babelversion: master - 'lttng-tools_{version}_coverity': version: master urcuversion: master ustversion: master + babelversion: master # stable-2.13 - '{job_prefix}lttng-tools_{version}_{buildtype}': @@ -1353,22 +1286,36 @@ babelversions: !!python/tuple [stable-2.0] filter: '' touchstone: '' - - '{job_prefix}lttng-tools_{version}_rootbuild': + - '{job_prefix}lttng-tools_{version}_root_{buildtype}': buildtype: linuxbuild version: stable-2.13 ustversion: stable-2.13 platforms: !!python/tuple [deb12-amd64] + nodes: !!python/tuple [deb12-amd64-rootnode] + builds: !!python/tuple [std] + confs: !!python/tuple [agents] + urcuversions: !!python/tuple [stable-0.13] + babelversions: !!python/tuple [stable-2.0] + filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")' + touchstone: '' + - '{job_prefix}lttng-tools_{version}_root_{buildtype}': + buildtype: portbuild + version: stable-2.13 + ustversion: stable-2.13 + platforms: !!python/tuple [deb12-i386, deb12-armhf, deb12-arm64] + nodes: !!python/tuple [deb12-i386-rootnode, deb12-armhf-rootnode, deb12-arm64-rootnode] 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=="deb12-amd64")' + filter: '((node=="deb12-i386-rootnode" && platform=="deb12-i386") || (node=="deb12-armhf-rootnode" && platform=="deb12-armhf") || (node=="deb12-arm64-rootnode" && platform=="deb12-arm64"))' touchstone: '' - '{job_prefix}lttng-tools_{version}_root_{buildtype}': buildtype: slesbuild version: stable-2.13 ustversion: stable-2.13 platforms: !!python/tuple [sles15sp4-amd64] + nodes: !!python/tuple [sles15sp4-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] @@ -1380,6 +1327,7 @@ version: stable-2.13 ustversion: stable-2.13 platforms: !!python/tuple [el8-amd64] + nodes: !!python/tuple [el8-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [std] urcuversions: !!python/tuple [stable-0.13] @@ -1395,6 +1343,7 @@ version: stable-2.13 urcuversion: stable-0.13 ustversion: stable-2.13 + babelversion: stable-2.0 # stable-2.12 - '{job_prefix}lttng-tools_{version}_{buildtype}': @@ -1484,22 +1433,24 @@ babelversions: !!python/tuple [stable-2.0] filter: '' touchstone: '' - - '{job_prefix}lttng-tools_{version}_rootbuild': + - '{job_prefix}lttng-tools_{version}_root_{buildtype}': buildtype: linuxbuild version: stable-2.12 ustversion: stable-2.12 platforms: !!python/tuple [deb12-amd64] + nodes: !!python/tuple [deb12-amd64-rootnode-linux5] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode-linux5" && platform=="deb12-amd64")' + filter: '(node=="deb12-amd64-rootnode-linux5" && platform=="deb12-amd64")' touchstone: '' - '{job_prefix}lttng-tools_{version}_root_{buildtype}': buildtype: slesbuild version: stable-2.12 ustversion: stable-2.12 platforms: !!python/tuple [sles15sp4-amd64] + nodes: !!python/tuple [sles15sp4-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] @@ -1511,6 +1462,7 @@ version: stable-2.12 ustversion: stable-2.12 platforms: !!python/tuple [el8-amd64] + nodes: !!python/tuple [el8-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [std] urcuversions: !!python/tuple [stable-0.13] @@ -1526,6 +1478,7 @@ version: stable-2.12 urcuversion: stable-0.13 ustversion: stable-2.12 + babelversion: stable-2.0 - project: name: dev_jgalar_lttng-tools @@ -1650,20 +1603,22 @@ babelversions: !!python/tuple [stable-2.0] filter: '' touchstone: '' - - 'dev_review_lttng-tools_{version}_rootbuild': + - 'dev_review_lttng-tools_{version}_root_{buildtype}': version: master buildtype: linuxbuild platforms: !!python/tuple [deb12-amd64] + nodes: !!python/tuple [deb12-amd64-rootnode] 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=="deb12-amd64")' + filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")' touchstone: '' - 'dev_review_lttng-tools_{version}_root_{buildtype}': version: master buildtype: slesbuild platforms: !!python/tuple [sles15sp4-amd64] + nodes: !!python/tuple [sles15sp4-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.14] @@ -1704,20 +1659,22 @@ babelversions: !!python/tuple [stable-2.0] filter: '' touchstone: '' - - 'dev_review_lttng-tools_{version}_rootbuild': + - 'dev_review_lttng-tools_{version}_root_{buildtype}': version: stable-2.13 buildtype: linuxbuild platforms: !!python/tuple [deb12-amd64] + nodes: !!python/tuple [deb12-amd64-rootnode] 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=="deb12-amd64")' + filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")' touchstone: '' - 'dev_review_lttng-tools_{version}_root_{buildtype}': version: stable-2.13 buildtype: slesbuild platforms: !!python/tuple [sles15sp4-amd64] + nodes: !!python/tuple [sles15sp4-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] @@ -1730,26 +1687,29 @@ version: stable-2.12 buildtype: linuxbuild platforms: !!python/tuple [deb12-amd64] + nodes: !!python/tuple [deb12-amd64-rootnode] 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}_rootbuild': + - 'dev_review_lttng-tools_{version}_root_{buildtype}': version: stable-2.12 buildtype: linuxbuild platforms: !!python/tuple [deb12-amd64] + nodes: !!python/tuple [deb12-amd64-rootnode-linux5] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13] babelversions: !!python/tuple [stable-2.0] - filter: '(node=="amd64-rootnode-linux5" && platform=="deb12-amd64")' + filter: '(node=="deb12-amd64-rootnode-linux5" && platform=="deb12-amd64")' touchstone: '' - 'dev_review_lttng-tools_{version}_root_{buildtype}': version: stable-2.12 buildtype: slesbuild platforms: !!python/tuple [sles15sp4-amd64] + nodes: !!python/tuple [sles15sp4-amd64-rootnode] builds: !!python/tuple [std] confs: !!python/tuple [agents] urcuversions: !!python/tuple [stable-0.13]