X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=d37d4db98782724fc213c6fe237d9c25519753de;hb=e5f5905a0b96d2911a3bb8a7f8fba6cfd49d8b67;hp=278b838e54521d667930373e736a142bd4873a72;hpb=5d26e468f94cb77fce8c3a0871edee71476b0909;p=lttng-ci.git diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 278b838..d37d4db 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,7 +339,7 @@ - throttle: option: 'category' categories: - - 'gerrit' + - 'gerrit-{buildtype}' - job-template: name: dev_gerrit_babeltrace_winbuild @@ -401,7 +378,7 @@ - throttle: option: 'category' categories: - - 'gerrit' + - 'gerrit-winbuild' <<: *babeltrace_build_axes_defaults <<: *babeltrace_build_builders_win @@ -556,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' @@ -564,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 @@ -582,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/**' @@ -615,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: @@ -674,9 +651,6 @@ arch: !!python/tuple [sles12sp2] build: !!python/tuple [std] conf: !!python/tuple [std] - version: # // support 1.3 on SLES12 - - stable-1.3 - - stable-1.5 - 'babeltrace_{version}_{buildtype}': buildtype: elbuild arch: !!python/tuple [el8] @@ -699,7 +673,7 @@ 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' @@ -746,7 +720,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' @@ -754,7 +728,7 @@ - 'babeltrace_{version}_pylint' - 'babeltrace_{version}_coverity': version: master - - 'babeltrace_{version}_glib-2.22.5': + - 'babeltrace_{version}_glib-2.28.6': version: master - project: @@ -788,7 +762,6 @@ github_name: babeltrace email_to: "jgalar@efficios.com" version: - - stable-1.3-staging - stable-1.5-staging jobs: - 'dev_{user}_babeltrace_{version}_{buildtype}': @@ -798,8 +771,6 @@ conf: !!python/tuple [std, static, python-bindings] - 'dev_{user}_babeltrace_{version}_{buildtype}': buildtype: macosxbuild - version: # macOS support was introduced in 1.4 - - stable-1.5-staging arch: !!python/tuple [macosx] build: !!python/tuple [std] conf: !!python/tuple [std] @@ -815,7 +786,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}':