X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=923dd7e10369a706bcf127d2353490acee70db80;hb=20defd5e328ab5a054111f3657ebc0323a3a2f7f;hp=b90d27c3ef22a15dc637574e4638f2eaf57f3e34;hpb=edf727106a2ce2b9bfa7a83936eb0b14fe3c2582;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index b90d27c..923dd7e 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -23,12 +23,16 @@
           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:
@@ -57,21 +61,40 @@
       - axis:
          type: user-defined
          name: liburcu_version
-         values:
-           !include: jobs/inc/liburcu-versions.yaml.inc
+         values: '{obj:liburcu_version}'
       - axis:
          type: user-defined
          name: build
          values: '{obj:build}'
 
     builders:
-      - copyartifact:
-          project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std
-          which-build: last-successful
-          stable: true
-          filter: 'build/**'
-          target: 'deps/liburcu'
-          do-not-fingerprint: true
+      - conditional-step:
+          condition-kind: regex-match
+          label: '$conf'
+          regex: (std|agents)
+          on-evaluation-failure: run
+          steps:
+            - copyartifact:
+                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std
+                which-build: last-successful
+                stable: false
+                filter: 'build/**'
+                target: 'deps'
+                do-not-fingerprint: true
+
+      - conditional-step:
+          condition-kind: regex-match
+          label: '$conf'
+          regex: (debug-rcu)
+          on-evaluation-failure: run
+          steps:
+            - copyartifact:
+                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=debug-rcu,build=std
+                which-build: last-successful
+                stable: false
+                filter: 'build/**'
+                target: 'deps'
+                do-not-fingerprint: true
       - shell:
          !include-raw-escape: scripts/lttng-ust/build.sh
 
@@ -79,6 +102,7 @@
     publishers:
       - tap:
           results: 'tap/**/*.log'
+          fail-if-no-results: true
           failed-tests-mark-build-as-failure: true
           todo-is-failure: false
       - warnings:
@@ -91,152 +115,31 @@
               total-normal: 0
               total-low: 0
       - archive:
-          artifacts: 'build/**'
+          artifacts: 'build/**,tap/**'
           allow-empty: false
       - workspace-cleanup
-      - ircbot:
-          strategy: new-failure-and-fixed
-          matrix-notifier: only-parent
-          channels:
-            - name: '#lttng'
-
-- job-template:
-    name: lttng-ust_{version}_java-tests
-    defaults: lttng-ust
-    description: |
-      Tests for LTTng-UST's Java agent. Runs the master branch of
-      <a href="https://github.com/lttng/lttng-ust-java-tests">lttng-ust-java-tests</a>
-      against the {version} branches of UST, lttng-tools, and Babeltrace.
-
-      <p>Job is managed by Jenkins Job Builder.</p>
-
-    project-type: matrix
-    node: 'master' # Applies only to matrix flyweight task
-    axes:
-      - axis:
-         type: slave
-         name: arch
-         values: '{obj:arch}'
-      - axis:
-         type: user-defined
-         name: jdk_version
-         values:
-           - 'OpenJDK-8'
-      - axis:
-         type: user-defined
-         name: liburcu_version
-         values:
-           - 'master'
-      - axis:
-         type: user-defined
-         name: lttng_ust_version
-         values:
-           - 'master'
-      - axis:
-         type: user-defined
-         name: lttng_tools_version
-         values:
-           - 'master'
-
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-      - inject:
-          properties-content: |
-            LD_LIBRARY_PATH="${{WORKSPACE}}/deps/build/lib"
-            PATH="${{WORKSPACE}}/deps/build/bin:${{PATH}}"
-            LTTNG_CONSUMERD32_BIN="${{WORKSPACE}}/deps/build/lib/lttng/libexec/lttng-consumerd"
-            LTTNG_CONSUMERD64_BIN="${{WORKSPACE}}/deps/build/lib/lttng/libexec/lttng-consumerd"
-          script-content: |
-
-    scm:
-      - git:
-          url: git://github.com/lttng/lttng-ust-java-tests.git
-          browser: githubweb
-          browser-url: https://github.com/lttng/lttng-ust-java-tests
-          branches:
-            - origin/{version}
-          basedir: lttng-ust-java-tests
-
-    triggers:
-      - pollscm:
-          cron: "@daily"
-
-    properties:
-      - build-discarder:
-          num-to-keep: 2
-      - github:
-          url: https://github.com/lttng/lttng-ust-java-tests
-
-    builders:
-      - copyartifact:
-          project: liburcu_${{liburcu_version}}_build/arch=${{arch}},conf=std,build=std
-          which-build: last-successful
-          stable: true
-          filter: 'build/**'
-          target: 'deps'
-          do-not-fingerprint: true
-      - copyartifact:
-          project: lttng-ust_{version}_build/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=java-agent,build=std
-          which-build: last-successful
-          stable: true
-          filter: 'build/**'
-          target: 'deps'
-          do-not-fingerprint: true
-      - copyartifact:
-          project: lttng-tools_${{lttng_tools_version}}_build/babeltrace_version=master,liburcu_version=${{liburcu_version}},arch=${{arch}},conf=java-agent,build=std
-          which-build: last-successful
-          stable: true
-          filter: 'build/**'
-          target: 'deps'
-          do-not-fingerprint: true
-      - copyartifact:
-          project: babeltrace_master_build/arch=${{arch}},conf=std,build=std
-          which-build: last-successful
-          stable: true
-          filter: 'build/**'
-          target: 'deps'
-          do-not-fingerprint: true
-      - shell: |
-          #!/bin/sh -eux
-
-          # Start the lttng-sessiond
-          lttng-sessiond -d
-      - maven-target:
-          goals: '-version'
-          maven-version: 'Maven 3.3.3'
-          private-repository: true
-      - maven-target:
-          goals: |
-            clean
-            verify
-          pom: 'lttng-ust-java-tests/pom.xml'
-          properties:
-            - maven.test.failure.ignore=true
-            - common-jar-location=${{WORKSPACE}}/deps/build/share/java/lttng-ust-agent-common.jar
-            - jul-jar-location=${{WORKSPACE}}/deps/build/share/java/lttng-ust-agent-jul.jar
-            - log4j-jar-location=${{WORKSPACE}}/deps/build/share/java/lttng-ust-agent-log4j.jar
-            - argLine=-Djava.library.path=${{WORKSPACE}}/deps/build/lib
-          maven-version: 'Maven 3.3.3'
-          private-repository: true
-      - shell: |
-          #!/bin/sh -eux
-
-          # Kill the sessiond
-          killall lttng-sessiond
-
-    publishers:
-      - junit:
-          results: lttng-ust-java-tests/**/target/failsafe-reports/*.xml
       - email-ext:
-          recipients: alex@voxpopuli.im
-          matrix-trigger: only-parent
-          failure: false
+          recipients: '{obj:email_to}'
+          reply-to: ci-notification@lists.lttng.org
+          always: false
+          unstable: false
           first-failure: true
-          fixed: true
-      - workspace-cleanup
-
+          first-unstable: true
+          not-built: false
+          aborted: false
+          regression: false
+          failure: false
+          second-failure: false
+          improvement: false
+          still-failing: false
+          success: false
+          fixed: false
+          fixed-unhealthy: true
+          still-unstable: false
+          pre-build: false
+          matrix-trigger: only-parent
+          send-to:
+            - recipients
 
 - job-template:
     name: lttng-ust_{version}_cppcheck
@@ -248,15 +151,15 @@
 
     builders:
       - shell: |
-          rm -f lttng-ust-cppcheck.xml
-          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/lttng-ust 2> lttng-ust-cppcheck.xml
+          rm -f cppcheck-result.xml
+          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/lttng-ust 2> cppcheck-result.xml
 
     publishers:
       - archive:
-          artifacts: 'lttng-ust-cppcheck.xml'
+          artifacts: 'cppcheck-result.xml'
           allow-empty: false
       - cppcheck:
-          pattern: 'lttng-ust-cppcheck.xml'
+          pattern: 'cppcheck-result.xml'
       - email:
           recipients: 'ci-notification@lists.lttng.org'
           notify-every-unstable-build: true
@@ -265,7 +168,7 @@
 - job-template:
     name: lttng-ust_{version}_scan-build
     defaults: lttng-ust
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -273,14 +176,14 @@
 
     builders:
       - copyartifact:
-          project: liburcu_master_build/arch=x86-64,conf=std,build=std
+          project: liburcu_master_build/arch=amd64,conf=std,build=std
           which-build: last-successful
-          stable: true
+          stable: false
           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:
@@ -291,7 +194,7 @@
 - job-template:
     name: lttng-ust_{version}_coverity
     defaults: lttng-ust
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -310,9 +213,9 @@
 
     builders:
       - copyartifact:
-          project: liburcu_master_build/arch=x86-64,conf=std,build=std
+          project: liburcu_master_build/arch=amd64,conf=std,build=std
           which-build: last-successful
-          stable: true
+          stable: false
           filter: 'build/**'
           target: 'deps/liburcu'
           do-not-fingerprint: true
@@ -325,73 +228,84 @@
           artifacts: 'analysis-results.tgz,cov-int/**'
           allow-empty: false
 
-# TODO
-- job-template:
-    name: lttng-ust_{version}_pylint
-    defaults: lttng-ust
-    node: 'x86-64'
 
-    scm: []
+## Views
+- view-template:
+    name: 'LTTng-ust'
+    view-type: list
+    regex: 'lttng-ust[-_].*'
 
-    triggers:
-      - pollscm:
-          cron: "@daily"
 
-    builders:
-       - copyartifact:
-           project: lttng-ust-{version}/arch=x86-64,build=std,conf=python-agent
-           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
-
-    publishers:
-      - archive:
-          artifacts: 'pep8.out,pylint.out'
-      - violations:
-          pep8:
-            pattern: pep8.out
-            min: 10
-            max: 999
-            unstable: 999
-          pylint:
-            pattern: pylint.out
-            min: 10
-            max: 999
-            unstable: 999
-      - email:
-          recipients: 'ci-notification@lists.lttng.org'
-          notify-every-unstable-build: true
-          send-to-individuals: false
-
-
-## Project
+## Projects
 - project:
     name: lttng-ust
     github_user: lttng
     github_name: lttng-ust
+    email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
     version:
-      - stable-2.7
       - stable-2.8
-      - master
+      - stable-2.9
+      - stable-2.10
+      - stable-2.11
     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]
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, dist, oot, oot-dist]
+          conf: !!python/tuple [std, agents, debug-rcu]
+          liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, stable-0.11, master]
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std, java-agent, python-agent]
-      - 'lttng-ust_{version}_java-tests':
-          arch: !!python/tuple [x86-32, x86-64]
+          conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, stable-0.11, master]
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.11, master]
       - 'lttng-ust_{version}_cppcheck'
       - 'lttng-ust_{version}_scan-build'
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: build
+          version: master
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, dist, oot, oot-dist]
+          conf: !!python/tuple [std, agents, debug-rcu]
+          liburcu_version: !!python/tuple [stable-0.11, master]
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: portbuild
+          version: master
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [stable-0.11, master]
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: master
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.11, master]
+      - 'lttng-ust_{version}_cppcheck':
+          version: master
+      - 'lttng-ust_{version}_scan-build':
+          version: master
       - 'lttng-ust_{version}_coverity':
           version: master
 
+      # stable-2.7
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: stable-2.7
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.9]
+
+- project:
+    name: lttng-ust-views
+    views:
+      - LTTng-ust