From: Michael Jeanson Date: Fri, 6 Jan 2017 21:26:20 +0000 (-0500) Subject: jjb: use bt1.5 while 2.0 is merged in master X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=21ae1ad6224d38f6af09298883abb20a1cb620f9;p=lttng-ci.git jjb: use bt1.5 while 2.0 is merged in master Signed-off-by: Michael Jeanson --- diff --git a/jobs/lttng-analyses.yaml b/jobs/lttng-analyses.yaml index 811ba32..910ff4b 100644 --- a/jobs/lttng-analyses.yaml +++ b/jobs/lttng-analyses.yaml @@ -88,7 +88,7 @@ builders: - copyartifact: - project: babeltrace_master_build/arch=x86-64,build=std,conf=python-bindings + project: babeltrace_{babeltrace_version}_build/arch=x86-64,build=std,conf=python-bindings which-build: last-successful stable: false filter: 'build/**' @@ -126,6 +126,7 @@ jobs: - 'lttng-analyses_{version}_build': arch: !!python/tuple [x86-32, x86-64] - babeltrace_version: !!python/tuple [stable-1.3, stable-1.4, master] - - 'lttng-analyses_{version}_pylint' + babeltrace_version: !!python/tuple [stable-1.4, stable-1.5, master] + - 'lttng-analyses_{version}_pylint': + babeltrace_version: stable-1.5 diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index cad2abb..e7c98e9 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -414,7 +414,7 @@ build: !!python/tuple [std, oot, dist] conf: !!python/tuple [std, no-ust, agents] urcuversion: !!python/tuple [master] - babelversion: !!python/tuple [master] + babelversion: !!python/tuple [stable-1.5] - 'lttng-tools_{version}_{buildtype}': buildtype: portbuild version: master @@ -423,7 +423,7 @@ build: !!python/tuple [std] conf: !!python/tuple [std, no-ust, agents] urcuversion: !!python/tuple [master] - babelversion: !!python/tuple [master] + babelversion: !!python/tuple [stable-1.5] - 'lttng-tools_{version}_{buildtype}': buildtype: macosxbuild version: master @@ -432,7 +432,7 @@ build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [master] - babelversion: !!python/tuple [master] + babelversion: !!python/tuple [stable-1.5] - 'lttng-tools_{version}_{buildtype}': buildtype: macosxbuild version: stable-2.9 @@ -441,7 +441,7 @@ build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.4] + babelversion: !!python/tuple [stable-1.5] - 'lttng-tools_{version}_{buildtype}': buildtype: solarisbuild version: master @@ -450,7 +450,7 @@ build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [master] - babelversion: !!python/tuple [master] + babelversion: !!python/tuple [stable-1.5] - 'lttng-tools_{version}_{buildtype}': buildtype: build version: stable-2.9 @@ -459,7 +459,7 @@ build: !!python/tuple [std, oot, dist] conf: !!python/tuple [std, no-ust, agents] urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.4] + babelversion: !!python/tuple [stable-1.5] - 'lttng-tools_{version}_{buildtype}': buildtype: portbuild version: stable-2.9 @@ -468,7 +468,7 @@ build: !!python/tuple [std] conf: !!python/tuple [std, no-ust, agents] urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.4] + babelversion: !!python/tuple [stable-1.5] - 'lttng-tools_{version}_{buildtype}': buildtype: solarisbuild version: stable-2.9 @@ -477,7 +477,7 @@ build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.4] + babelversion: !!python/tuple [stable-1.5] - 'lttng-tools_{version}_{buildtype}': buildtype: build version: stable-2.8 @@ -534,7 +534,7 @@ build: !!python/tuple [std, oot, dist] conf: !!python/tuple [std, no-ust, agents] urcuversion: !!python/tuple [master] - babelversion: !!python/tuple [master] + babelversion: !!python/tuple [stable-1.5] - 'dev_{user}_lttng-tools_{version}_{buildtype}': user: jgalar github_user: jgalar @@ -546,7 +546,7 @@ build: !!python/tuple [std, oot, dist] conf: !!python/tuple [std, no-ust, agents] urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.4] + babelversion: !!python/tuple [stable-1.5] - 'dev_{user}_lttng-tools_{version}_{buildtype}': user: jgalar github_user: jgalar @@ -582,7 +582,7 @@ build: !!python/tuple [std] conf: !!python/tuple [std, no-ust, agents] urcuversion: !!python/tuple [master] - babelversion: !!python/tuple [master] + babelversion: !!python/tuple [stable-1.5] - 'dev_{user}_lttng-tools_{version}_{buildtype}': user: jgalar github_user: jgalar @@ -594,7 +594,7 @@ build: !!python/tuple [std] conf: !!python/tuple [std, no-ust, agents] urcuversion: !!python/tuple [stable-0.9] - babelversion: !!python/tuple [stable-1.4] + babelversion: !!python/tuple [stable-1.5] - 'dev_{user}_lttng-tools_{version}_{buildtype}': user: jgalar github_user: jgalar @@ -630,7 +630,7 @@ build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [master] - babelversion: !!python/tuple [master] + babelversion: !!python/tuple [stable-1.5] - 'dev_{user}_lttng-tools_{version}_{buildtype}': user: jgalar github_user: jgalar @@ -642,7 +642,7 @@ build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [master] - babelversion: !!python/tuple [master] + babelversion: !!python/tuple [stable-1.5] - 'lttng-tools_{version}_cppcheck' - 'lttng-tools_{version}_scan-build': version: master diff --git a/jobs/lttng-ust-benchmarks.yaml b/jobs/lttng-ust-benchmarks.yaml index 1c1f6b0..acc9078 100644 --- a/jobs/lttng-ust-benchmarks.yaml +++ b/jobs/lttng-ust-benchmarks.yaml @@ -56,14 +56,14 @@ target: 'deps/liburcu' do-not-fingerprint: true - copyartifact: - project: babeltrace_master_build/arch=x86-64,build=std,conf=std + project: babeltrace_{babeltrace_version}_build/arch=x86-64,build=std,conf=std which-build: last-successful stable: false filter: 'build/**' target: 'deps/babeltrace' do-not-fingerprint: true - copyartifact: - project: lttng-tools_master_build/arch=x86-64,babeltrace_version=master,build=std,conf=python-bindings,liburcu_version=master + project: lttng-tools_master_build/arch=x86-64,babeltrace_version={babeltrace_version},build=std,conf=agents,liburcu_version=master which-build: last-successful stable: false filter: 'build/**' @@ -127,4 +127,5 @@ jobs: - 'lttng-ust-benchmarks_{version}_{buildtype}': buildtype: build + babeltrace_version: stable-1.5 diff --git a/jobs/lttng-ust-java-tests.yaml b/jobs/lttng-ust-java-tests.yaml index ed41dcd..4b5e517 100644 --- a/jobs/lttng-ust-java-tests.yaml +++ b/jobs/lttng-ust-java-tests.yaml @@ -98,14 +98,14 @@ target: 'deps' do-not-fingerprint: true - copyartifact: - project: lttng-tools_${{lttng_tools_version}}_build/babeltrace_version=master,liburcu_version=${{liburcu_version}},arch=${{arch}},conf=agents,build=std + project: lttng-tools_${{lttng_tools_version}}_build/babeltrace_version={babeltrace_version},liburcu_version=${{liburcu_version}},arch=${{arch}},conf=agents,build=std which-build: last-successful stable: false filter: 'build/**' target: 'deps' do-not-fingerprint: true - copyartifact: - project: babeltrace_master_build/arch=${{arch}},conf=std,build=std + project: babeltrace_{babeltrace_version}_build/arch=${{arch}},conf=std,build=std which-build: last-successful stable: false filter: 'build/**' @@ -157,6 +157,7 @@ - master lttng_tools_version: - master + babeltrace_version: stable-1.5 jobs: - 'lttng-ust-java-tests_{version}_build': arch: !!python/tuple [x86-32, x86-64]