X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=e842aa0b10e596100e89a740c85c7ce608c006bd;hb=67122b969e7777215709ea1c15b9cd96630d27d2;hp=33ad79fb12b1aee021aa97b68c5a0b55856ee2dc;hpb=2b68721ab3a069c3763abf5746a7a8823d804791;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 33ad79f..e842aa0 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: https://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.git
+          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,18 +77,19 @@
           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:
+            unstable:
               total-all: 0
               total-high: 0
               total-normal: 0
@@ -99,6 +98,11 @@
           artifacts: 'build/**'
           allow-empty: false
       - workspace-cleanup
+      - ircbot:
+          strategy: new-failure-and-fixed
+          matrix-notifier: only-parent
+          channels:
+            - name: '#lttng'
 
 
 - job-template:
@@ -112,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:
@@ -135,8 +139,15 @@
           cron: "@daily"
 
     builders:
+      - copyartifact:
+          project: liburcu_master_build/arch=x86-64,conf=std,build=std
+          which-build: last-successful
+          stable: true
+          filter: 'build/**'
+          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:
@@ -144,26 +155,44 @@
           dir: 'scan-build-archive/'
           files: 'index.html'
 
-# TODO: lttng-ust_{version}_coverity
-#- job-template:
-#    name: lttng-ust_{version}_coverity
-#    defaults: lttng-ust
-#    node: 'x86-64'
-#
-#    triggers:
-#      - pollscm:
-#          cron: "@daily"
-#
-#    builders:
-#      - shell:
-#          !include-raw-escape scripts/lttng-ust/coverity.sh
-#
-#    publishers:
-#      - html-publisher:
-#          name: 'HTML Report'
-#          dir: 'scan-build-archive/'
-#          files: 'index.html'
+- job-template:
+    name: lttng-ust_{version}_coverity
+    defaults: lttng-ust
+    node: 'x86-64'
+
+    triggers:
+      - pollscm:
+          cron: "@daily"
+
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor:
+          colormap: xterm
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: lttng-ust_coverity_token
+              username: COVERITY_SCAN_PROJECT_NAME
+              password: COVERITY_SCAN_TOKEN
+
+    builders:
+      - copyartifact:
+          project: liburcu_master_build/arch=x86-64,conf=std,build=std
+          which-build: last-successful
+          stable: true
+          filter: 'build/**'
+          target: 'deps/liburcu'
+          do-not-fingerprint: true
+      - shell:
+          !include-raw-escape: scripts/common/coverity.sh
+
+    publishers:
+      - workspace-cleanup
+      - archive:
+          artifacts: 'analysis-results.tgz,cov-int/**'
+          allow-empty: false
 
+# TODO
 - job-template:
     name: lttng-ust_{version}_pylint
     defaults: lttng-ust
@@ -177,14 +206,14 @@
 
     builders:
        - copyartifact:
-           project: lttng-ust-{version}/arch=x86-64,build=std,conf=python-agent
+           project: lttng-ust-{version}/arch=x86-64,build=std,conf=agents
            which-build: last-successful
            stable: true
            filter: 'build/**'
            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:
@@ -209,17 +238,26 @@
 ## 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]
+          build: !!python/tuple [std, dist, oot, oot-dist]
+          conf: !!python/tuple [std, agents]
       - '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, agents]
       - 'lttng-ust_{version}_cppcheck'
       - 'lttng-ust_{version}_scan-build'
+      - 'lttng-ust_{version}_coverity':
+          version: master