X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=ec21a8245c454174d8da491c953dd372e901276e;hb=53b51a153a5615633d47cedb589c6ce030332202;hp=3526f3de62568f9348da7c5aafa04e2369583f6b;hpb=7f5ffb7a83d9cbf929e0f75e35914396d3ced4e6;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 3526f3d..ec21a82 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -150,15 +150,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
@@ -167,7 +167,7 @@
 - job-template:
     name: lttng-ust_{version}_scan-build
     defaults: lttng-ust
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -175,7 +175,7 @@
 
     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: false
           filter: 'build/**'
@@ -193,7 +193,7 @@
 - job-template:
     name: lttng-ust_{version}_coverity
     defaults: lttng-ust
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -212,7 +212,7 @@
 
     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: false
           filter: 'build/**'
@@ -231,7 +231,7 @@
 - job-template:
     name: lttng-ust_{version}_pylint
     defaults: lttng-ust
-    node: 'x86-64'
+    node: 'amd64'
 
     scm: []
 
@@ -241,7 +241,7 @@
 
     builders:
        - copyartifact:
-           project: lttng-ust-{version}/arch=x86-64,build=std,conf=agents
+           project: lttng-ust-{version}/arch=amd64,build=std,conf=agents
            which-build: last-successful
            stable: false
            filter: 'build/**'
@@ -301,13 +301,13 @@
     jobs:
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
-          arch: !!python/tuple [x86-32, x86-64]
+          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, 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, agents]
           liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master]
@@ -322,14 +322,14 @@
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: master
-          arch: !!python/tuple [x86-32, x86-64]
+          arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
           conf: !!python/tuple [std, agents, debug-rcu]
           liburcu_version: !!python/tuple [master]
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: master
-          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
           liburcu_version: !!python/tuple [master]