X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=a37dc31a8ee388fdd839f407936e83d0789031db;hb=cefcd7f8ab5682123fef582f7a87accc30500d38;hp=ade2e88bee5c589e251524568503ef294e99e0e3;hpb=72d113b00d3bad6185892522a20082819028e7f1;p=lttng-ci.git diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index ade2e88..a37dc31 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -17,9 +17,9 @@ wrappers: - ansicolor - timeout: - timeout: 90 + timeout: 20 fail: true - type: absolute + type: no-activity - timestamps - workspace-cleanup: clean-if: @@ -99,17 +99,6 @@ - babeltrace_build_builders_win: &babeltrace_build_builders_win name: 'babeltrace_build_builders_win' builders: - - conditional-step: - condition-kind: strings-match - on-evaluation-failure: run - condition-string1: '${{arch}}' - condition-string2: 'cygwin' - steps: - - shell: - !include-raw-escape: - - scripts/common/cygwin-shebang - - scripts/common/cygwin-prefix - - scripts/babeltrace/build.sh - conditional-step: condition-kind: strings-match on-evaluation-failure: run @@ -119,7 +108,7 @@ - shell: !include-raw-escape: - scripts/common/cygwin64-shebang - - scripts/common/cygwin-prefix + - scripts/common/cygpath-prefix - scripts/babeltrace/build.sh - conditional-step: condition-kind: strings-match @@ -132,7 +121,7 @@ - shell: !include-raw-escape: - scripts/common/msys2-shebang - - scripts/common/cygwin-prefix + - scripts/common/cygpath-prefix - scripts/babeltrace/build.sh - conditional-step: condition-kind: strings-match @@ -145,7 +134,7 @@ - shell: !include-raw-escape: - scripts/common/msys2-shebang - - scripts/common/cygwin-prefix + - scripts/common/cygpath-prefix - scripts/babeltrace/build.sh @@ -279,18 +268,6 @@ name: babeltrace_{version}_winbuild defaults: babeltrace - # Use jgit on windows to work around path too long error - scm: - - git: - url: git://github.com/{github_user}/{github_name}.git - browser: githubweb - browser-url: https://github.com/{github_user}/{github_name} - branches: - - origin/{version} - basedir: src/babeltrace - skip-tag: true - git-tool: jgit - <<: *babeltrace_build_axes_defaults <<: *babeltrace_build_builders_win <<: *babeltrace_build_publishers_prod @@ -362,10 +339,53 @@ - throttle: option: 'category' categories: - - 'gerrit' + - 'gerrit-{buildtype}' - job-template: - name: dev_gerrit_babeltrace_black + name: dev_gerrit_babeltrace_winbuild + defaults: babeltrace + concurrent: true + + scm: + - git: + url: https://review.lttng.org/babeltrace + refspec: 'refs/changes/*:refs/changes/*' + branches: + - '$GERRIT_REFSPEC' + basedir: src/babeltrace + skip-tag: true + + triggers: + - gerrit: + trigger-on: + - comment-added-event: + approval-category: 'CI-Build' + approval-value: 1 + projects: + - project-compare-type: 'PLAIN' + project-pattern: 'babeltrace' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**' + trigger-for-unreviewed-patches: true + + properties: + - inject: + properties-content: | + PROJECT_NAME=babeltrace + - build-discarder: + days-to-keep: 1 + - throttle: + option: 'category' + categories: + - 'gerrit-winbuild' + + <<: *babeltrace_build_axes_defaults + <<: *babeltrace_build_builders_win + <<: *babeltrace_build_publishers_gerrit + +- job-template: + name: dev_gerrit_babeltrace_pylint defaults: babeltrace concurrent: true @@ -396,7 +416,7 @@ builders: - shell: - !include-raw-escape: scripts/babeltrace/black.sh + !include-raw-escape: scripts/babeltrace/pylint.sh properties: - inject: @@ -478,36 +498,17 @@ defaults: babeltrace node: 'amd64' - scm: [] - triggers: - pollscm: cron: "@daily" builders: - - copyartifact: - project: babeltrace_{version}_build/arch=amd64,build=std,conf=python-bindings - which-build: last-successful - stable: false - filter: 'build/**' - target: 'deps/babeltrace' - shell: !include-raw-escape: scripts/babeltrace/pylint.sh publishers: - archive: - artifacts: 'pep8.out,pylint.out' - - violations: - pep8: - pattern: pep8.out - min: 10 - max: 999 - unstable: 999 - pylint: - pattern: pylint.out - min: 10 - max: 999 - unstable: 999 + artifacts: 'black.out,flake8.out' - email-ext: recipients: '{obj:email_to}' reply-to: ci-notification@lists.lttng.org @@ -532,7 +533,7 @@ - recipients # Use - in version number since yaml anchor do not support dot -- babeltrace_version_glib-2-22-5_anchor: &babeltrace_version_glib-2-22-5_anchor +- babeltrace_version_glib-2-28-6_anchor: &babeltrace_version_glib-2-28-6_anchor name: 'babeltrace_version_glib_anchor' defaults: babeltrace node: 'amd64' @@ -540,17 +541,17 @@ 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 + LD_LIBRARY_PATH=$WORKSPACE/glib-2.28.6/BUILD_RESULT/lib + PKG_CONFIG_PATH=$WORKSPACE/glib-2.28.6/BUILD_RESULT/lib/pkgconfig arch=amd64 conf=std build=std - shell: | - wget http://ftp.gnome.org/pub/gnome/sources/glib/2.22/glib-2.22.5.tar.gz - tar xvf glib-2.22.5.tar.gz - cd glib-2.22.5 + 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 + cd glib-2.28.6 mkdir BUILD_RESULT - ./configure --prefix=$WORKSPACE/glib-2.22.5/BUILD_RESULT + ./configure --prefix=$WORKSPACE/glib-2.28.6/BUILD_RESULT make -j `nproc` make install @@ -558,11 +559,11 @@ !include-raw-escape: scripts/babeltrace/build.sh - job-template: - name: babeltrace_{version}_glib-2.22.5 + name: babeltrace_{version}_glib-2.28.6 triggers: - pollscm: cron: "@daily" - <<: *babeltrace_version_glib-2-22-5_anchor + <<: *babeltrace_version_glib-2-28-6_anchor publishers: - archive: artifacts: 'tap/**' @@ -591,8 +592,8 @@ - recipients - job-template: - name: dev_{user}_babeltrace_{version}_glib-2.22.5 - <<: *babeltrace_version_glib-2-22-5_anchor + name: dev_{user}_babeltrace_{version}_glib-2.28.6 + <<: *babeltrace_version_glib-2-28-6_anchor publishers: - email-ext: @@ -653,6 +654,11 @@ version: # // support 1.3 on SLES12 - stable-1.3 - stable-1.5 + - 'babeltrace_{version}_{buildtype}': + buildtype: elbuild + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std] - 'babeltrace_{version}_{buildtype}': buildtype: solarisbuild arch: !!python/tuple [sol10-i386, sol11-i386] @@ -670,12 +676,11 @@ conf: !!python/tuple [std, static] cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7] - 'babeltrace_{version}_winbuild': - arch: !!python/tuple [cygwin, cygwin64] + arch: !!python/tuple [cygwin64] build: !!python/tuple [std] conf: !!python/tuple [std] - 'babeltrace_{version}_cppcheck' - 'babeltrace_{version}_scan-build' - - 'babeltrace_{version}_pylint' - project: name: babeltrace2 @@ -701,6 +706,11 @@ arch: !!python/tuple [sles12sp2] build: !!python/tuple [std] conf: !!python/tuple [std, prod] + - 'babeltrace_{version}_{buildtype}': + buildtype: elbuild + arch: !!python/tuple [el8] + build: !!python/tuple [std] + conf: !!python/tuple [std, prod] - 'babeltrace_{version}_{buildtype}': buildtype: macosxbuild arch: !!python/tuple [macosx] @@ -713,7 +723,7 @@ conf: !!python/tuple [std, static, prod] cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7] - 'babeltrace_{version}_winbuild': - arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64] + arch: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64] build: !!python/tuple [std] conf: !!python/tuple [std] - 'babeltrace_{version}_cppcheck' @@ -721,7 +731,7 @@ - 'babeltrace_{version}_pylint' - 'babeltrace_{version}_coverity': version: master - - 'babeltrace_{version}_glib-2.22.5': + - 'babeltrace_{version}_glib-2.28.6': version: master - project: @@ -741,7 +751,11 @@ build: !!python/tuple [std] conf: !!python/tuple [std, prod] filter: '' - - 'dev_gerrit_babeltrace_black' + - 'dev_gerrit_babeltrace_winbuild': + arch: !!python/tuple [cygwin64, msys2-mingw64] + build: !!python/tuple [std] + conf: !!python/tuple [std] + - 'dev_gerrit_babeltrace_pylint' - project: @@ -778,7 +792,7 @@ - stable-2.0-staging - master-staging jobs: - - 'dev_{user}_babeltrace_{version}_glib-2.22.5': + - 'dev_{user}_babeltrace_{version}_glib-2.28.6': version: - master-staging - 'dev_{user}_babeltrace_{version}_{buildtype}':