X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=fc8aae75371042f174be8dc979f467b12e59a853;hb=e6dd082253411acfd9e0d5e2d4fff3ba33dd0f39;hp=89722c37d3027b473e4865a20c9dabdec858d803;hpb=732698e982b146987ab598bb595b910978e8e381;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 89722c3..fc8aae7 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -109,24 +109,10 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: {{ '${{platform}}' }}
-          condition-string2: 'msys2-mingw32'
+          condition-string2: 'msys2-ucrt64'
           steps:
             - inject:
-               properties-content: 'MSYSTEM=MINGW32'
-            - shell:
-               !include-raw-escape:
-                 - scripts/common/msys2-shebang
-                 - scripts/common/cygpath-prefix
-                 - scripts/common/print.sh
-                 - scripts/babeltrace/build.sh
-      - conditional-step:
-          condition-kind: strings-match
-          on-evaluation-failure: run
-          condition-string1: {{ '${{platform}}' }}
-          condition-string2: 'msys2-mingw64'
-          steps:
-            - inject:
-               properties-content: 'MSYSTEM=MINGW64'
+               properties-content: 'MSYSTEM=UCRT64'
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
@@ -359,7 +345,7 @@
     <<: *babeltrace_publishers_review
 
 - job-template:
-    name: 'dev_review_babeltrace_{version}_pylint'
+    name: 'dev_review_babeltrace_{version}_lint'
     defaults: babeltrace
     concurrent: true
 
@@ -373,7 +359,7 @@
 
     builders:
       - shell:
-         !include-raw-escape: scripts/babeltrace/pylint.sh
+         !include-raw-escape: scripts/babeltrace/lint.sh
 
     properties:
       - inject:
@@ -383,6 +369,9 @@
           days-to-keep: 1
 
     publishers:
+      - archive:
+          artifacts: 'black.out,flake8.out,isort.out,clang-format.out,shellcheck.out,check-include-guards.out'
+          allow-empty: false
       - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults
 
 - job-template:
@@ -539,7 +528,7 @@
       - ircbot: *babeltrace_publisher_ircbot_defaults
 
 - job-template:
-    name: babeltrace_{version}_pylint
+    name: babeltrace_{version}_lint
     defaults: babeltrace
     node: 'deb12-amd64'
 
@@ -549,12 +538,12 @@
 
     builders:
        - shell:
-          !include-raw-escape: scripts/babeltrace/pylint.sh
+          !include-raw-escape: scripts/babeltrace/lint.sh
 
     publishers:
       - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults
       - archive:
-          artifacts: 'black.out,flake8.out'
+          artifacts: 'black.out,flake8.out,isort.out,clang-format.out,shellcheck.out,check-include-guards.out'
           allow-empty: false
       - ircbot: *babeltrace_publisher_ircbot_defaults
       - email-ext: *babeltrace_publisher_email-ext_defaults
@@ -593,13 +582,6 @@
           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]
-          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: portbuild
           platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
@@ -609,7 +591,7 @@
           touchstone: '(build == "std") && (conf == "std") && (platform == "deb12-i386")'
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: slesbuild
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64, sles15sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''
@@ -623,14 +605,14 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: yoctobuild
-          platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
+          platforms: !!python/tuple [yocto23-powerpcspe, yocto40-powerpc, yocto40-ppc64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''
@@ -644,7 +626,7 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: winbuild
-          platforms: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64]
+          platforms: !!python/tuple [cygwin64, msys2-ucrt64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -660,7 +642,7 @@
       - 'babeltrace_{version}_release':
           version: v2.0
       - 'babeltrace_{version}_scan-build'
-      - 'babeltrace_{version}_pylint'
+      - 'babeltrace_{version}_lint'
       - 'babeltrace_{version}_coverity':
           version: master
       - '{job_prefix}babeltrace_{version}_glib-2.28.6':
@@ -673,6 +655,7 @@
     github_name: babeltrace
     version:
       - stable-2.0
+      - ctf2
       - master
     jobs:
     ## Master ##
@@ -697,16 +680,62 @@
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: master
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''
           touchstone: ''
           warnings_status: FAILED
+      - 'dev_review_babeltrace_{version}_{buildtype}':
+          buildtype: slesbuild
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64, sles15sp5-amd64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          filter: ''
+          touchstone: ''
+          warnings_status: FAILED
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: master
           buildtype: winbuild
-          platforms: !!python/tuple [cygwin64, msys2-mingw64]
+          platforms: !!python/tuple [cygwin64, msys2-ucrt64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          filter: ''
+          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-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-ucrt64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -735,7 +764,7 @@
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: stable-2.0
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''
@@ -744,7 +773,7 @@
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: stable-2.0
           buildtype: winbuild
-          platforms: !!python/tuple [cygwin64, msys2-mingw64]
+          platforms: !!python/tuple [cygwin64, msys2-ucrt64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -759,7 +788,7 @@
           filter: ''
           touchstone: ''
       - 'dev_review_babeltrace_{version}_check-format'
-      - 'dev_review_babeltrace_{version}_pylint'
+      - 'dev_review_babeltrace_{version}_lint'
 
 
 - project:
@@ -787,7 +816,7 @@
           touchstone: '(build == "std") && (conf == "std") && (platform == "deb12-i386")'
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: slesbuild
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64, sles15sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -821,7 +850,7 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -850,35 +879,12 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''
           touchstone: ''
 
-- project:
-    name: babeltrace2-mjeanson
-    job_prefix: 'dev_mjeanson_'
-    github_user: efficios
-    github_name: babeltrace
-    email_to: "mjeanson@efficios.com"
-    version:
-      - master
-    jobs:
-      - '{job_prefix}babeltrace_{version}_{buildtype}':
-          buildtype: portbuild
-          platforms: !!python/tuple [sid-riscv64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std, prod]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}babeltrace_{version}_{buildtype}':
-          buildtype: build
-          platforms: !!python/tuple [deb12-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std, prod]
-          filter: ''
-          touchstone: ''
 
 - project:
     name: babeltrace-views