X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=0e7d693fd8d6c5db5f2fe2e5b7276d7c8e5f57a7;hb=4b9bec35c5509eff42dc1f516ef956cc6e92127a;hp=cda7068312a2704bae79d4f3a374ba1b43aab164;hpb=c9b78c7b872561ac36695aac2d44a9c5a38f1052;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index cda7068..0e7d693 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -10,12 +10,6 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: -1
-        numToKeep: 2
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -23,19 +17,26 @@
 
     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}
+          basedir: src/lttng-ust
+          skip-tag: true
 
     triggers:
       - pollscm:
           cron: "@hourly"
 
     properties:
+      - inject:
+          properties-content: |
+            PROJECT_NAME=lttng-ust
+      - build-discarder:
+          num-to-keep: 2
       - github:
-          url: https://github.com/lttng/lttng-ust
+          url: https://github.com/{github_user}/{github_name}
 
 
 ## Templates
@@ -44,7 +45,7 @@
     defaults: lttng-ust
 
     project-type: matrix
-    node: 'x86-32 || x86-64' # Applies only to matrix flyweight task
+    node: 'master' # Applies only to matrix flyweight task
     execution-strategy:
       combination-filter: |
         (build=="std") || (liburcu_version=="master")
@@ -56,15 +57,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 +77,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'
+          results: 'tap/**/*.log'
           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'
@@ -116,7 +116,7 @@
     builders:
       - shell: |
           rm -f lttng-ust-cppcheck.xml
-          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE 2> lttng-ust-cppcheck.xml
+          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/lttng-ust 2> lttng-ust-cppcheck.xml
 
     publishers:
       - archive:
@@ -147,7 +147,7 @@
           target: 'deps/liburcu'
           do-not-fingerprint: true
       - shell:
-          !include-raw-escape scripts/lttng-ust/scan-build.sh
+          !include-raw-escape: scripts/common/scan-build.sh
 
     publishers:
       - html-publisher:
@@ -184,10 +184,13 @@
           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
+      - archive:
+          artifacts: 'analysis-results.tgz,cov-int/**'
+          allow-empty: false
 
 # TODO
 - job-template:
@@ -210,7 +213,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 +238,24 @@
 ## Project
 - project:
     name: lttng-ust
+    github_user: lttng
+    github_name: lttng-ust
     version:
-      !include jobs/inc/lttng-ust-versions.yaml.inc
+      - stable-2.7
+      - stable-2.8
+      - stable-2.9
+      - master
     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':