jjb: lttng-tools build script cleanup

[lttng-ci.git] / jobs / lttng-tools.yaml

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index b5d5f09518ae6ba7a1d6b27b56ca86474b9cc20e..7a029396de92dd8e7df623c322c879b21080bd9c 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -22,6 +22,7 @@
           browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
+          basedir: src/lttng-tools
           skip-tag: true
 
     triggers:
@@ -29,6 +30,9 @@
           cron: "@hourly"
 
     properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=lttng-tools
       - github:
           url: https://github.com/{github_user}/{github_name}
       - build-discarder:
@@ -295,7 +299,7 @@
           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:
@@ -395,6 +399,7 @@
     version:
       - stable-2.7
       - stable-2.8
+      - stable-2.9
       - master
     jobs:
       - 'lttng-tools_{version}_{buildtype}':
@@ -424,6 +429,15 @@
           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
@@ -433,6 +447,33 @@
           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
@@ -490,6 +531,18 @@
           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
@@ -526,6 +579,18 @@
           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
@@ -550,11 +615,39 @@
           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