jjb: fix ubuntu kernel builds with new kernel-wedge

[lttng-ci.git] / jobs / babeltrace.yaml

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 6486914a7cf412cbbd19bf0910256595fc124d7a..ec2426bd8f63d19dce8a23b0898f3bfc2dd347e8 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -245,20 +245,20 @@
 
     builders:
       - shell: |
-          rm -f babeltrace-cppcheck.xml
-          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/babeltrace 2> babeltrace-cppcheck.xml
+          rm -f cppcheck-result.xml
+          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/babeltrace 2> cppcheck-result.xml
 
     publishers:
       - archive:
-          artifacts: 'babeltrace-cppcheck.xml'
+          artifacts: 'cppcheck-result.xml'
           allow-empty: false
       - cppcheck:
-          pattern: 'babeltrace-cppcheck.xml'
+          pattern: 'cppcheck-result.xml'
 
 - job-template:
     name: babeltrace_{version}_scan-build
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -277,7 +277,7 @@
 - job-template:
     name: babeltrace_{version}_coverity
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     triggers:
       - pollscm:
@@ -306,7 +306,7 @@
 - job-template:
     name: babeltrace_{version}_pylint
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     scm: []
 
@@ -316,7 +316,7 @@
 
     builders:
        - copyartifact:
-           project: babeltrace_{version}_build/arch=x86-64,build=std,conf=python-bindings
+           project: babeltrace_{version}_build/arch=amd64,build=std,conf=python-bindings
            which-build: last-successful
            stable: false
            filter: 'build/**'
@@ -365,14 +365,14 @@
 - babeltrace_version_glib-2-22-5_anchor: &babeltrace_version_glib-2-22-5_anchor
     name: 'babeltrace_version_glib_anchor'
     defaults: babeltrace
-    node: 'x86-64'
+    node: 'amd64'
 
     builders:
       - inject:
           properties-content: |
             LD_LIBRARY_PATH=$WORKSPACE/glib-2.22.5/BUILD_RESULT/lib
             PKG_CONFIG_PATH=$WORKSPACE/glib-2.22.5/BUILD_RESULT/lib/pkgconfig
-            arch=x86-64
+            arch=amd64
             conf=std
             build=std
       - shell: |
@@ -460,17 +460,17 @@
     jobs:
       - 'babeltrace_{version}_{buildtype}':
           buildtype: build
-          arch: !!python/tuple [x86-32, x86-64]
+          arch: !!python/tuple [amd64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, static, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: clangbuild
-          arch: !!python/tuple [x86-32, x86-64]
+          arch: !!python/tuple [amd64]
           build: !!python/tuple [clang]
           conf: !!python/tuple [std, static]
       - 'babeltrace_{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, static, python-bindings]
       - 'babeltrace_{version}_{buildtype}':
@@ -533,7 +533,7 @@
             - master-staging
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
           buildtype: build
-          arch: !!python/tuple [x86-32, x86-64]
+          arch: !!python/tuple [amd64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, static, python-bindings]
       - 'dev_{user}_babeltrace_{version}_{buildtype}':