X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=8f96c2d748583319be6b6ffa405ce124d2c62b3c;hb=7525e08da069498cf67a9c427b751fc172118e6b;hp=224bbcd47bf36d6b4926867e3af2265492a6946e;hpb=0a9d9a7427fa05cd8039c39e49aeeb9e76257b49;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 224bbcd..8f96c2d 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -14,6 +14,10 @@
       - workspace-cleanup
       - timestamps
       - ansicolor
+      - timeout:
+          timeout: 60
+          fail: true
+          type: absolute
 
     scm:
       - git:
@@ -22,6 +26,7 @@
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
+          basedir: src/lttng-tools
           skip-tag: true
 
     triggers:
@@ -93,75 +98,75 @@
             - copyartifact:
                 project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{conf}},build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/liburcu'
                 do-not-fingerprint: true
             - copyartifact:
                 project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=${{conf}},build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/babeltrace'
                 do-not-fingerprint: true
             - copyartifact:
                 project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/lttng-ust'
                 do-not-fingerprint: true
       - conditional-step:
           condition-kind: regex-match
           label: '$conf'
-          regex: (python-bindings|no-ust)
+          regex: no-ust
           on-evaluation-failure: run
           steps:
             - copyartifact:
                 project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/liburcu'
                 do-not-fingerprint: true
             - copyartifact:
                 project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/babeltrace'
                 do-not-fingerprint: true
             - copyartifact:
                 project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=std,build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/lttng-ust'
                 do-not-fingerprint: true
       - conditional-step:
           condition-kind: regex-match
           label: '$conf'
-          regex: (java-agent|python-agent)
+          regex: agents
           on-evaluation-failure: run
           steps:
             - copyartifact:
                 project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/liburcu'
                 do-not-fingerprint: true
             - copyartifact:
                 project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/babeltrace'
                 do-not-fingerprint: true
             - copyartifact:
                 project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/lttng-ust'
                 do-not-fingerprint: true
@@ -174,17 +179,44 @@
             - copyartifact:
                 project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/liburcu'
                 do-not-fingerprint: true
             - copyartifact:
                 project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
                 which-build: last-successful
-                stable: true
+                stable: false
                 filter: 'build/**'
                 target: 'deps/babeltrace'
                 do-not-fingerprint: true
+      - conditional-step:
+          condition-kind: regex-match
+          label: '$conf'
+          regex: debug-rcu
+          on-evaluation-failure: run
+          steps:
+            - copyartifact:
+                project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=debug-rcu,build=std
+                which-build: last-successful
+                stable: false
+                filter: 'build/**'
+                target: 'deps/liburcu'
+                do-not-fingerprint: true
+            - copyartifact:
+                project: babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
+                which-build: last-successful
+                stable: false
+                filter: 'build/**'
+                target: 'deps/babeltrace'
+                do-not-fingerprint: true
+            - copyartifact:
+                project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=debug-rcu,build=std
+                which-build: last-successful
+                stable: false
+                filter: 'build/**'
+                target: 'deps/lttng-ust'
+                do-not-fingerprint: true
       - shell:
          !include-raw-escape: scripts/lttng-tools/build.sh
 
@@ -286,14 +318,14 @@
       - copyartifact:
           project: liburcu_{urcuversion}_build/arch=x86-64,conf=std,build=std
           which-build: last-successful
-          stable: true
+          stable: false
           filter: 'build/**'
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - copyartifact:
           project: lttng-ust_{ustversion}_build/liburcu_version={urcuversion},arch=x86-64,conf=std,build=std
           which-build: last-successful
-          stable: true
+          stable: false
           filter: 'build/**'
           target: 'deps/lttng-ust'
           do-not-fingerprint: true
@@ -330,14 +362,14 @@
       - copyartifact:
           project: liburcu_{urcuversion}_build/arch=x86-64,conf=std,build=std
           which-build: last-successful
-          stable: true
+          stable: false
           filter: 'build/**'
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - copyartifact:
           project: lttng-ust_{ustversion}_build/liburcu_version={urcuversion},arch=x86-64,conf=std,build=std
           which-build: last-successful
-          stable: true
+          stable: false
           filter: 'build/**'
           target: 'deps/lttng-ust'
           do-not-fingerprint: true
@@ -361,9 +393,9 @@
 
     builders:
        - copyartifact:
-           project: lttng-tools-{version}/arch=x86-64,build=std,conf=python-agent
+           project: lttng-tools-{version}/arch=x86-64,build=std,conf=agents
            which-build: last-successful
-           stable: true
+           stable: false
            filter: 'build/**'
            target: 'deps/lttng-tools'
            do-not-fingerprint: true
@@ -407,18 +439,18 @@
           ustversion: master
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents, debug-rcu]
           urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [master]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: master
           ustversion: master
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [master]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: macosxbuild
           version: master
@@ -427,7 +459,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [master]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: macosxbuild
           version: stable-2.9
@@ -436,7 +468,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.4]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: solarisbuild
           version: master
@@ -445,25 +477,25 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [master]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.9
           ustversion: stable-2.9
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents, debug-rcu]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.4]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.9
           ustversion: stable-2.9
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.4]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: solarisbuild
           version: stable-2.9
@@ -472,14 +504,14 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.4]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.8
           ustversion: stable-2.8
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents, debug-rcu]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.4]
       - 'lttng-tools_{version}_{buildtype}':
@@ -488,7 +520,7 @@
           ustversion: stable-2.8
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.4]
       - 'lttng-tools_{version}_{buildtype}':
@@ -506,7 +538,7 @@
           ustversion: stable-2.7
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents, debug-rcu]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.3]
       - 'lttng-tools_{version}_{buildtype}':
@@ -515,7 +547,7 @@
           ustversion: stable-2.7
           arch: !!python/tuple [armhf, arm64, powerpc]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.3]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
@@ -527,9 +559,9 @@
           ustversion: master
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [master]
+          babelversion: !!python/tuple [stable-1.5]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           user: jgalar
           github_user: jgalar
@@ -539,9 +571,9 @@
           ustversion: stable-2.9
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.4]
+          babelversion: !!python/tuple [stable-1.5]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           user: jgalar
           github_user: jgalar
@@ -551,7 +583,7 @@
           ustversion: stable-2.8
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.4]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
@@ -563,7 +595,7 @@
           ustversion: stable-2.7
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.3]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
@@ -575,9 +607,9 @@
           ustversion: master
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [master]
+          babelversion: !!python/tuple [stable-1.5]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           user: jgalar
           github_user: jgalar
@@ -587,9 +619,9 @@
           ustversion: stable-2.9
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
-          babelversion: !!python/tuple [stable-1.4]
+          babelversion: !!python/tuple [stable-1.5]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           user: jgalar
           github_user: jgalar
@@ -599,7 +631,7 @@
           ustversion: stable-2.8
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.4]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
@@ -611,7 +643,7 @@
           ustversion: stable-2.7
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          conf: !!python/tuple [std, no-ust, agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.3]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
@@ -625,7 +657,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [master]
+          babelversion: !!python/tuple [stable-1.5]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           user: jgalar
           github_user: jgalar
@@ -637,7 +669,7 @@
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
-          babelversion: !!python/tuple [master]
+          babelversion: !!python/tuple [stable-1.5]
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
           version: master