X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=a140cd67edf1e16a2a30775eec2f45e0d835b84e;hb=0628a9d8d35076a287a887be0421fbca9f7a3cdf;hp=25dc66e8fa6b381598631462d7888b479dbce4c9;hpb=ca8c6144ba2cd9f9dc623c4f1f305ad84e600a7d;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 25dc66e..a140cd6 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -11,10 +11,7 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: -1
         numToKeep: 2
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
 
     wrappers:
       - workspace-cleanup
@@ -23,9 +20,9 @@
 
     scm:
       - git:
-          url: git://github.com/lttng/lttng-ust.git
+          url: git://github.com/{github_user}/{github_name}.git
           browser: githubweb
-          browser-url: https://github.com/lttng/lttng-ust
+          browser-url: https://github.com/{github_user}/{github_name}
           branches:
             - origin/{version}
 
@@ -35,7 +32,7 @@
 
     properties:
       - github:
-          url: https://github.com/lttng/lttng-ust
+          url: https://github.com/{github_user}/{github_name}
 
 
 ## Templates
@@ -56,15 +53,12 @@
       - axis:
          type: user-defined
          name: conf
-         values:
-           - std
-           - java-agent
-           - python-agent
+         values: '{obj:conf}'
       - axis:
          type: user-defined
          name: liburcu_version
          values:
-           !include jobs/inc/liburcu-versions.yaml.inc
+           !include: jobs/inc/liburcu-versions.yaml.inc
       - axis:
          type: user-defined
          name: build
@@ -79,27 +73,29 @@
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - shell:
-         !include-raw-escape scripts/lttng-ust/build.sh
+         !include-raw-escape: scripts/lttng-ust/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'
@@ -147,7 +143,7 @@
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/lttng-ust/scan-build.sh
+          !include-raw-escape: scripts/lttng-ust/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -184,7 +180,7 @@
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/common/coverity.sh
+          !include-raw-escape: scripts/common/coverity.sh
 
     publishers:
       - workspace-cleanup
@@ -210,7 +206,7 @@
            target: 'deps/lttng-ust'
            do-not-fingerprint: true
        - shell:
-          !include-raw-escape scripts/lttng-ust/pylint.sh
+          !include-raw-escape: scripts/lttng-ust/pylint.sh
 
     publishers:
       - archive:
@@ -235,17 +231,21 @@
 ## Project
 - project:
     name: lttng-ust
+    github_user: lttng
+    github_name: lttng-ust
     version:
-      !include jobs/inc/lttng-ust-versions.yaml.inc
+      !include: jobs/inc/lttng-ust-versions.yaml.inc
     jobs:
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
+          conf: !!python/tuple [std, java-agent, python-agent]
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
-          arch: !!python/tuple [armhf, powerpc]
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
+          conf: !!python/tuple [std, java-agent, python-agent]
       - 'lttng-ust_{version}_cppcheck'
       - 'lttng-ust_{version}_scan-build'
       - 'lttng-ust_{version}_coverity':