X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=51dd99e5762e10984508a472d8605076ec8a417e;hb=8f584fa68ac826e365ea325adf93b2778e251bf3;hp=de1aa1d3ad702c765d7be3e701079fcb0935c8f0;hpb=0bccd148b2fa5b60110885a127c448fa8d862c02;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index de1aa1d..51dd99e 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -148,13 +148,14 @@
           properties-content: |
             LD_LIBRARY_PATH=$WORKSPACE/glib-2.28.6/BUILD_RESULT/lib
             PKG_CONFIG_PATH=$WORKSPACE/glib-2.28.6/BUILD_RESULT/lib/pkgconfig
-            platform=bionic-amd64
+            platform=deb12-amd64
             conf=std
             build=std
       - shell: |
-          wget http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.6.tar.gz
-          tar xvf glib-2.28.6.tar.gz
+          curl -OL 'https://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.6.tar.gz'
+          tar xf glib-2.28.6.tar.gz
           cd glib-2.28.6
+          sed -i 's/sys\/types\.h/sys\/sysmacros\.h/' gio/gdbusmessage.c # Fix build failure with recent glibc
           mkdir BUILD_RESULT
           ./configure --prefix=$WORKSPACE/glib-2.28.6/BUILD_RESULT
           make -j `nproc` >/dev/null 2>&1 # Hide warnings
@@ -368,7 +369,7 @@
     triggers:
       - gerrit: *babeltrace_trigger_gerrit_defaults
 
-    node: 'bionic-amd64'
+    node: 'deb12-amd64'
 
     builders:
       - shell:
@@ -436,7 +437,7 @@
     triggers:
       - gerrit: *babeltrace_trigger_gerrit_smoke
 
-    node: 'jammy-amd64'
+    node: 'deb12-amd64'
 
     builders:
       - shell:
@@ -458,7 +459,7 @@
 - job-template:
     name: babeltrace_{version}_release
     defaults: babeltrace
-    node: 'bionic-amd64'
+    node: 'deb12-amd64'
 
     triggers:
       - pollscm:
@@ -488,7 +489,7 @@
 - job-template:
     name: babeltrace_{version}_scan-build
     defaults: babeltrace
-    node: 'bionic-amd64'
+    node: 'deb12-amd64'
 
     triggers:
       - pollscm:
@@ -509,7 +510,7 @@
 - job-template:
     name: babeltrace_{version}_coverity
     defaults: babeltrace
-    node: 'bionic-amd64'
+    node: 'deb12-amd64'
 
     triggers:
       - pollscm:
@@ -540,7 +541,7 @@
 - job-template:
     name: babeltrace_{version}_pylint
     defaults: babeltrace
-    node: 'bionic-amd64'
+    node: 'deb12-amd64'
 
     triggers:
       - pollscm:
@@ -553,7 +554,7 @@
     publishers:
       - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults
       - archive:
-          artifacts: 'black.out,flake8.out'
+          artifacts: 'black.out,flake8.out,isort.out'
           allow-empty: false
       - ircbot: *babeltrace_publisher_ircbot_defaults
       - email-ext: *babeltrace_publisher_email-ext_defaults
@@ -561,7 +562,7 @@
 - job-template:
     name: '{job_prefix}babeltrace_{version}_glib-2.28.6'
     defaults: babeltrace
-    node: 'bionic-amd64'
+    node: 'deb12-amd64'
 
     <<: *babeltrace_builders_glib-2-28-6
     <<: *babeltrace_publishers_defaults
@@ -587,14 +588,7 @@
     jobs:
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: linuxbuild
-          platforms: !!python/tuple [jammy-amd64, deb12-amd64]
-          builds: !!python/tuple [std, oot, dist, oot-dist]
-          confs: !!python/tuple [std, static, prod, min, doc, asan]
-          filter: '(build=="std") || (conf=="std") || (conf=="doc")'
-          touchstone: '(build == "std") && (conf == "std")'
-      - '{job_prefix}babeltrace_{version}_{buildtype}':
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
           confs: !!python/tuple [std, static, prod, min, doc, asan]
           filter: '(build=="std") || (conf=="std") || (conf=="doc")'
@@ -650,10 +644,10 @@
           touchstone: ''
       - 'babeltrace_{version}_{cctype}':
           cctype: clangbuild
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, static, prod]
-          ccs: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7]
+          ccs: !!python/tuple [clang-13, clang-14, clang-15]
           filter: ''
           touchstone: ''
       - 'babeltrace_{version}_release':
@@ -672,13 +666,14 @@
     github_name: babeltrace
     version:
       - stable-2.0
+      - ctf2
       - master
     jobs:
     ## Master ##
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: master
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
           confs: !!python/tuple [std, static, prod, min]
           filter: ''
@@ -712,11 +707,49 @@
           touchstone: ''
           warnings_status: FAILED
 
+      ## ctf2 temp branch ##
+      - 'dev_review_babeltrace_{version}_{buildtype}':
+          version: ctf2
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
+          builds: !!python/tuple [std, oot, dist, oot-dist]
+          confs: !!python/tuple [std, static, prod, min]
+          filter: ''
+          touchstone: ''
+          warnings_status: FAILED
+      - 'dev_review_babeltrace_{version}_{buildtype}':
+          version: ctf2
+          buildtype: portbuild
+          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          filter: ''
+          touchstone: ''
+          warnings_status: FAILED
+      - 'dev_review_babeltrace_{version}_{buildtype}':
+          version: ctf2
+          buildtype: macosbuild
+          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std, prod]
+          filter: ''
+          touchstone: ''
+          warnings_status: FAILED
+      - 'dev_review_babeltrace_{version}_{buildtype}':
+          version: ctf2
+          buildtype: winbuild
+          platforms: !!python/tuple [cygwin64, msys2-mingw64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          filter: ''
+          touchstone: ''
+          warnings_status: FAILED
+
       ## Stable 2.0 ##
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: stable-2.0
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
           confs: !!python/tuple [std, static, prod, min]
           filter: ''
@@ -752,7 +785,7 @@
 
       ## ALL ##
       - 'dev_review_babeltrace_{version}_smokebuild':
-          platforms: !!python/tuple [jammy-amd64, deb12-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [oot-dist]
           confs: !!python/tuple [std]
           filter: ''
@@ -772,7 +805,7 @@
     jobs:
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: linuxbuild
-          platforms: !!python/tuple [jammy-amd64, deb12-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
           confs: !!python/tuple [std, static, python-bindings]
           filter: ''
@@ -812,8 +845,8 @@
       - stable-1.5-staging
     jobs:
       - '{job_prefix}babeltrace_{version}_{buildtype}':
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
           confs: !!python/tuple [std, static, python-bindings]
           filter: ''
@@ -841,8 +874,8 @@
           version:
             - master-staging
       - '{job_prefix}babeltrace_{version}_{buildtype}':
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
           confs: !!python/tuple [std, static, prod, min]
           filter: ''