X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=7a029396de92dd8e7df623c322c879b21080bd9c;hb=9eb09611b927b60c2ed394de859aa5ed003787bc;hp=0870252cf80afd7f071c19664e1e5e89d29ee3f5;hpb=7671741cd1f87b177d8f9568b98accd91524777b;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 0870252..7a02939 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -22,16 +22,22 @@
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
+          basedir: src/lttng-tools
+          skip-tag: true
 
     triggers:
       - pollscm:
           cron: "@hourly"
 
     properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=lttng-tools
       - github:
           url: https://github.com/{github_user}/{github_name}
       - build-discarder:
-          num-to-keep: 2
+          num-to-keep: 20
+          artifact-num-to-keep: 2
 
 
 ## Templates
@@ -68,7 +74,8 @@
       - github:
           url: https://github.com/{github_user}/{github_name}
       - build-discarder:
-          num-to-keep: 2
+          num-to-keep: 20
+          artifact-num-to-keep: 2
       - throttle:
           max-per-node: 1
           option: 'category'
@@ -99,7 +106,7 @@
                 target: 'deps/babeltrace'
                 do-not-fingerprint: true
             - copyartifact:
-                project: lttng-ust_{version}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std
+                project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std
                 which-build: last-successful
                 stable: true
                 filter: 'build/**'
@@ -126,7 +133,7 @@
                 target: 'deps/babeltrace'
                 do-not-fingerprint: true
             - copyartifact:
-                project: lttng-ust_{version}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=std,build=std
+                project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=std,build=std
                 which-build: last-successful
                 stable: true
                 filter: 'build/**'
@@ -153,12 +160,32 @@
                 target: 'deps/babeltrace'
                 do-not-fingerprint: true
             - copyartifact:
-                project: lttng-ust_{version}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std
+                project: lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std
                 which-build: last-successful
                 stable: true
                 filter: 'build/**'
                 target: 'deps/lttng-ust'
                 do-not-fingerprint: true
+      - conditional-step:
+          condition-kind: regex-match
+          label: '$conf'
+          regex: (relayd-only)
+          on-evaluation-failure: run
+          steps:
+            - copyartifact:
+                project: liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=std,build=std
+                which-build: last-successful
+                stable: true
+                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
+                filter: 'build/**'
+                target: 'deps/babeltrace'
+                do-not-fingerprint: true
       - shell:
          !include-raw-escape: scripts/lttng-tools/build.sh
 
@@ -190,7 +217,9 @@
       - archive:
           artifacts: 'build/**'
           allow-empty: false
-      - workspace-cleanup
+      - workspace-cleanup:
+          clean-if:
+            - failure: false
       - ircbot:
           strategy: new-failure-and-fixed
           matrix-notifier: only-parent
@@ -216,7 +245,9 @@
               total-high: 0
               total-normal: 0
               total-low: 0
-      - workspace-cleanup
+      - workspace-cleanup:
+          clean-if:
+            - failure: false
 
 
 - job-template:
@@ -261,14 +292,14 @@
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - copyartifact:
-          project: lttng-ust_{version}_build/liburcu_version={urcuversion},arch=x86-64,conf=std,build=std
+          project: lttng-ust_{ustversion}_build/liburcu_version={urcuversion},arch=x86-64,conf=std,build=std
           which-build: last-successful
           stable: true
           filter: 'build/**'
           target: 'deps/lttng-ust'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape: scripts/lttng-tools/scan-build.sh
+          !include-raw-escape: scripts/common/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -298,14 +329,14 @@
 
     builders:
       - copyartifact:
-          project: liburcu_master_build/arch=x86-64,conf=std,build=std
+          project: liburcu_{urcuversion}_build/arch=x86-64,conf=std,build=std
           which-build: last-successful
           stable: true
           filter: 'build/**'
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - copyartifact:
-          project: lttng-ust_{version}_build/liburcu_version={version},arch=x86-64,conf=std,build=std
+          project: lttng-ust_{ustversion}_build/liburcu_version={urcuversion},arch=x86-64,conf=std,build=std
           which-build: last-successful
           stable: true
           filter: 'build/**'
@@ -368,11 +399,13 @@
     version:
       - stable-2.7
       - stable-2.8
+      - stable-2.9
       - master
     jobs:
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: master
+          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]
@@ -381,14 +414,70 @@
       - '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]
           urcuversion: !!python/tuple [master]
           babelversion: !!python/tuple [master]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: macosxbuild
+          version: master
+          ustversion: master
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [master]
+          babelversion: !!python/tuple [master]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: macosxbuild
+          version: stable-2.9
+          ustversion: stable-2.9
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.4]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: solarisbuild
+          version: master
+          ustversion: master
+          arch: !!python/tuple [solaris10, solaris11]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [master]
+          babelversion: !!python/tuple [master]
+      - '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]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.4]
+      - '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]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.4]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: solarisbuild
+          version: stable-2.9
+          ustversion: stable-2.9
+          arch: !!python/tuple [solaris10, solaris11]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.4]
       - '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]
@@ -397,14 +486,25 @@
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.8
+          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]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.4]
+      - 'lttng-tools_{version}_{buildtype}':
+          buildtype: solarisbuild
+          version: stable-2.8
+          ustversion: stable-2.8
+          arch: !!python/tuple [solaris10, solaris11]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.4]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: stable-2.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]
@@ -413,6 +513,7 @@
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.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]
@@ -424,17 +525,31 @@
           github_name: lttng-tools
           buildtype: build
           version: master-staging
+          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]
           urcuversion: !!python/tuple [master]
           babelversion: !!python/tuple [master]
+      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
+          user: jgalar
+          github_user: jgalar
+          github_name: lttng-tools
+          buildtype: build
+          version: stable-2.9-staging
+          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]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.4]
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
           user: jgalar
           github_user: jgalar
           github_name: lttng-tools
           buildtype: build
           version: stable-2.8-staging
+          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]
@@ -446,22 +561,104 @@
           github_name: lttng-tools
           buildtype: build
           version: stable-2.7-staging
+          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]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.3]
+      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
+          user: jgalar
+          github_user: jgalar
+          github_name: lttng-tools
+          buildtype: portbuild
+          version: master-staging
+          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]
+          urcuversion: !!python/tuple [master]
+          babelversion: !!python/tuple [master]
+      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
+          user: jgalar
+          github_user: jgalar
+          github_name: lttng-tools
+          buildtype: portbuild
+          version: stable-2.9-staging
+          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]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.4]
+      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
+          user: jgalar
+          github_user: jgalar
+          github_name: lttng-tools
+          buildtype: portbuild
+          version: stable-2.8-staging
+          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]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.4]
+      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
+          user: jgalar
+          github_user: jgalar
+          github_name: lttng-tools
+          buildtype: portbuild
+          version: stable-2.7-staging
+          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]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.3]
+      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
+          user: jgalar
+          github_user: jgalar
+          github_name: lttng-tools
+          buildtype: macosxbuild
+          version: master-staging
+          ustversion: master
+          arch: !!python/tuple [macosx]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [master]
+          babelversion: !!python/tuple [master]
+      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
+          user: jgalar
+          github_user: jgalar
+          github_name: lttng-tools
+          buildtype: solarisbuild
+          version: master-staging
+          ustversion: master
+          arch: !!python/tuple [solaris10, solaris11]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [relayd-only]
+          urcuversion: !!python/tuple [master]
+          babelversion: !!python/tuple [master]
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
           version: master
           urcuversion: master
+          ustversion: master
+      - 'lttng-tools_{version}_scan-build':
+          version: stable-2.9
+          urcuversion: stable-0.9
+          ustversion: stable-2.9
       - 'lttng-tools_{version}_scan-build':
           version: stable-2.8
           urcuversion: stable-0.9
+          ustversion: stable-2.8
       - 'lttng-tools_{version}_scan-build':
           version: stable-2.7
           urcuversion: stable-0.9
+          ustversion: stable-2.7
       #- 'lttng-tools_{version}_pylint'
       - 'lttng-tools_{version}_coverity':
           version: master
+          urcuversion: master
+          ustversion: master