X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=2d5fe2aa39b56cd9a230e8cd37ebedf43fab5a4e;hb=9d903b5c02637f9a5a134793a36d50b938aee8a3;hp=a61f63e98ca7f2b45ae3d2a22acbe4382650f821;hpb=5719040c2a9caf160a7f8458befa4f7e0e89bc36;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index a61f63e..2d5fe2a 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'
+          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'
           allow-empty: false
       - ircbot: *babeltrace_publisher_ircbot_defaults
       - email-ext: *babeltrace_publisher_email-ext_defaults
@@ -623,7 +612,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, prod]
           filter: ''
@@ -637,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: ''
@@ -653,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':
@@ -666,6 +655,7 @@
     github_name: babeltrace
     version:
       - stable-2.0
+      - ctf2
       - master
     jobs:
     ## Master ##
@@ -690,7 +680,7 @@
       - '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: ''
@@ -699,7 +689,45 @@
       - '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: ''
@@ -728,7 +756,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: ''
@@ -737,7 +765,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: ''
@@ -752,7 +780,7 @@
           filter: ''
           touchstone: ''
       - 'dev_review_babeltrace_{version}_check-format'
-      - 'dev_review_babeltrace_{version}_pylint'
+      - 'dev_review_babeltrace_{version}_lint'
 
 
 - project:
@@ -814,7 +842,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: ''
@@ -843,7 +871,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, prod]
           filter: ''