X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=dfd7e0eef114938a62cb5b8648177538ab597fab;hb=9201e00def3912853ecc0f570a1abb915bf4ca5a;hp=5de63d8148524954d440a6252526af86dc31b777;hpb=10bbe356323e68a2e206b8ccb8de984933fd1282;p=lttng-ci.git diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 5de63d8..dfd7e0e 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -318,7 +318,7 @@ node: 'master' # Applies only to matrix flyweight task execution-strategy: combination-filter: | - ((build=="std" && conf=="python-bindings" && bt2_mode=="std") || (arch=="amd64")) && (! (arch="amd64" && (build=="oot" || build=="dist") && bt2_mode=="dev")) + (build=="std" && conf=="python-bindings") || (arch=="amd64") axes: - axis: type: slave @@ -332,10 +332,6 @@ type: user-defined name: build values: '{obj:build}' - - axis: - type: user-defined - name: bt2_mode - values: '{obj:bt2_mode}' <<: *babeltrace_build_builders_defaults <<: *babeltrace_build_publishers_gerrit @@ -672,5 +668,4 @@ buildtype: build arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386] build: !!python/tuple [std, oot, dist] - conf: !!python/tuple [std, python-bindings] - bt2_mode: !!python/tuple [dev, std] + conf: !!python/tuple [std, python-bindings, production]