X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=22bdc3a3cb2165fb07dfb6f0144d89f3324ff4a6;hb=d02fd60421fcb4a65ac1fedeb5dc8bce54b2ce4b;hp=99031423f9682a2fb741d6a7056737c40b3e1519;hpb=c871b3d3c859c4c5157bbb439836e94c682d4638;p=lttng-ci.git diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 9903142..22bdc3a 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -34,7 +34,6 @@ - origin/{version} basedir: src/babeltrace skip-tag: true - git-tool: jgit triggers: - pollscm: @@ -274,6 +273,18 @@ 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 @@ -314,7 +325,25 @@ branch-pattern: '**' trigger-for-unreviewed-patches: true - <<: *babeltrace_build_axes_defaults + project-type: matrix + node: 'master' # Applies only to matrix flyweight task + execution-strategy: + combination-filter: | + (build=="std" && conf=="python-bindings") || (arch=="amd64") + axes: + - axis: + type: slave + name: arch + values: '{obj:arch}' + - axis: + type: user-defined + name: conf + values: '{obj:conf}' + - axis: + type: user-defined + name: build + values: '{obj:build}' + <<: *babeltrace_build_builders_defaults <<: *babeltrace_build_publishers_gerrit @@ -548,11 +577,21 @@ - stable-2.0 - master jobs: + - 'babeltrace_{version}_{buildtype}': + buildtype: build + arch: !!python/tuple [amd64] + build: !!python/tuple [std, oot, dist] + conf: !!python/tuple [std, static, python-bindings, production] + version: + - stable-2.0 + - master - 'babeltrace_{version}_{buildtype}': buildtype: build arch: !!python/tuple [amd64] build: !!python/tuple [std, oot, dist] conf: !!python/tuple [std, static, python-bindings] + version: + - stable-1.5 - 'babeltrace_{version}_{buildtype}': buildtype: portbuild arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] @@ -648,7 +687,6 @@ jobs: - 'dev_gerrit_babeltrace_{buildtype}': buildtype: build - #arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386] - arch: !!python/tuple [amd64, i386] - build: !!python/tuple [std] - conf: !!python/tuple [std, python-bindings] + arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386] + build: !!python/tuple [std, oot, dist] + conf: !!python/tuple [std, static, python-bindings, production]