X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=c0caa8e42111c07ec5ee5a081d736a61e1b2e55f;hb=edf727106a2ce2b9bfa7a83936eb0b14fe3c2582;hp=e1c4a2b73398946dd0320217626cae28c8d33eac;hpb=b4005bbf43fd72200b510910629c618ccd324508;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index e1c4a2b..c0caa8e 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -10,12 +10,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: -1
-        numToKeep: 2
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -23,9 +17,9 @@
 
     scm:
       - git:
-          url: git://github.com/lttng/lttng-tools.git
+          url: git://github.com/{github_user}/{github_name}.git
           browser: githubweb
-          browser-url: https://github.com/lttng/lttng-tools
+          browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
 
@@ -35,7 +29,9 @@
 
     properties:
       - github:
-          url: https://github.com/lttng/lttng-tools
+          url: https://github.com/{github_user}/{github_name}
+      - build-discarder:
+          num-to-keep: 2
 
 
 ## Templates
@@ -44,10 +40,7 @@
     defaults: lttng-tools
 
     project-type: matrix
-    node: 'x86-32 || x86-64' # Applies only to matrix flyweight task
-    execution-strategy:
-      combination-filter: |
-        (build=="std") || (liburcu_version=="master")
+    node: 'master' # Applies only to matrix flyweight task
     axes:
       - axis:
          type: slave
@@ -56,12 +49,7 @@
       - axis:
          type: user-defined
          name: conf
-         values:
-           - std
-           #- static
-           - no_ust
-           - python_bindings
-           - java_agents
+         values: '{obj:conf}'
       - axis:
          type: user-defined
          name: liburcu_version
@@ -75,6 +63,26 @@
          name: build
          values: '{obj:build}'
 
+    properties:
+      - github:
+          url: https://github.com/{github_user}/{github_name}
+      - build-discarder:
+          num-to-keep: 2
+      - throttle:
+          max-per-node: 1
+          option: 'category'
+          categories:
+            - 'lttng-tools'
+          matrix-builds: false
+          matrix-configs: true
+
+    triggers:
+      - pollscm:
+          cron: "@hourly"
+      - reverse:
+            jobs: 'lttng-ust_{version}_{buildtype}'
+            result: 'success'
+
     builders:
       - conditional-step:
           condition-kind: regex-match
@@ -106,7 +114,7 @@
       - conditional-step:
           condition-kind: regex-match
           label: '$conf'
-          regex: (python_bindings|no_ust)
+          regex: (python-bindings|no-ust)
           on-evaluation-failure: run
           steps:
             - copyartifact:
@@ -133,7 +141,7 @@
       - conditional-step:
           condition-kind: regex-match
           label: '$conf'
-          regex: (java_agents)
+          regex: (java-agent|python-agent)
           on-evaluation-failure: run
           steps:
             - copyartifact:
@@ -151,33 +159,39 @@
                 target: 'deps/babeltrace'
                 do-not-fingerprint: true
             - copyartifact:
-                project: lttng-ust_{version}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=java-agent,build=std
+                project: lttng-ust_{version}_{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
       - shell:
-         !include-raw-escape scripts/lttng-tools/build.sh
+         !include-raw-escape: scripts/lttng-tools/build.sh
 
     # TODO: Scan for open tasks
     publishers:
       - tap:
           results: 'tap/**/*.tap'
           failed-tests-mark-build-as-failure: true
+          todo-is-failure: false
       - warnings:
           console-log-parsers:
             - 'GNU Make + GNU C Compiler (gcc)'
-          #total-thresholds:
-          #  failed:
-          #    total-all: 0
-          #    total-high: 0
-          #    total-normal: 0
-          #    total-low: 0
+          total-thresholds:
+            unstable:
+              total-all: 0
+              total-high: 0
+              total-normal: 0
+              total-low: 0
       - archive:
           artifacts: 'build/**'
           allow-empty: false
       - workspace-cleanup
+      - ircbot:
+          strategy: new-failure-and-fixed
+          matrix-notifier: only-parent
+          channels:
+            - name: '#lttng'
 
 
 - job-template:
@@ -229,7 +243,7 @@
           target: 'deps/lttng-ust'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/lttng-tools/scan-build.sh
+          !include-raw-escape: scripts/lttng-tools/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -273,7 +287,7 @@
           target: 'deps/lttng-ust'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -299,7 +313,7 @@
            target: 'deps/lttng-tools'
            do-not-fingerprint: true
        - shell:
-          !include-raw-escape scripts/lttng-tools/pylint.sh
+          !include-raw-escape: scripts/lttng-tools/pylint.sh
 
     publishers:
       - archive:
@@ -324,61 +338,71 @@
 ## Project
 - project:
     name: lttng-tools
+    github_user: lttng
+    github_name: lttng-tools
     version:
-      !include jobs/inc/lttng-tools-versions.yaml.inc
+      - stable-2.7
+      - stable-2.8
+      - master
     jobs:
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: build
           version: 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]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
           version: master
-          arch: !!python/tuple [armhf, powerpc]
+          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: build
-          version: stable-2.7
+          version: stable-2.8
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          urcuversion: !!python/tuple [stable-0.8]
-          babelversion: !!python/tuple [stable-1.2]
+          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.7
-          arch: !!python/tuple [armhf, powerpc]
+          version: stable-2.8
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
-          urcuversion: !!python/tuple [stable-0.8]
-          babelversion: !!python/tuple [stable-1.2]
+          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: build
-          version: stable-2.6
+          version: stable-2.7
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
-          urcuversion: !!python/tuple [stable-0.8]
-          babelversion: !!python/tuple [stable-1.2]
+          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.3]
       - 'lttng-tools_{version}_{buildtype}':
           buildtype: portbuild
-          version: stable-2.6
-          arch: !!python/tuple [armhf, powerpc]
+          version: stable-2.7
+          arch: !!python/tuple [armhf, arm64, powerpc]
           build: !!python/tuple [std]
-          urcuversion: !!python/tuple [stable-0.8]
-          babelversion: !!python/tuple [stable-1.2]
+          conf: !!python/tuple [std, no-ust, python-bindings, java-agent, python-agent]
+          urcuversion: !!python/tuple [stable-0.9]
+          babelversion: !!python/tuple [stable-1.3]
       - 'lttng-tools_{version}_cppcheck'
       - 'lttng-tools_{version}_scan-build':
           version: master
           urcuversion: master
       - 'lttng-tools_{version}_scan-build':
-          version: stable-2.7
-          urcuversion: stable-0.8
+          version: stable-2.8
+          urcuversion: stable-0.9
       - 'lttng-tools_{version}_scan-build':
-         version: stable-2.6
-         urcuversion: stable-0.8
+          version: stable-2.7
+          urcuversion: stable-0.9
       #- 'lttng-tools_{version}_pylint'
       - 'lttng-tools_{version}_coverity':
           version: master