diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2017-03-20 21:00:22 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2017-03-20 21:00:22 +0000 |
| commit | 127e0b0b09b760bbbb8af7387dd9e7d5781aa7fe (patch) | |
| tree | adf9847ea5af1f8df88c790a6fcb67b22530ff86 /tcwg-make-release.yaml | |
| parent | 5035d78d9674f76b812e09116cafcfa1100d6fd1 (diff) | |
tcwg-make-release: Add new --canadian and --buildnumber options for MakeRelease.job.
Since MakeRelease.job was updated not to depend on environment variables,
we have to supply the right parameters.
Change-Id: Id1f6b9f26f3f0b4c922637bf99a18efeb2790c75
Diffstat (limited to 'tcwg-make-release.yaml')
| -rw-r--r-- | tcwg-make-release.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tcwg-make-release.yaml b/tcwg-make-release.yaml index 305d9d09..7243ffec 100644 --- a/tcwg-make-release.yaml +++ b/tcwg-make-release.yaml @@ -143,13 +143,14 @@ # toolchains at a time when run on a amd64 slave. # When run on a i386 host, no need to duplicate the # Canadian cross build for mingw. + canadian= case ${label} in docker-*-amd64-tcwg*) host=x86_64 - export canadian=true ;; + canadian=--canadian ;; docker-*-i386-tcwg*) host=i686 - export canadian=no ;; + canadian= ;; *) echo "ERROR: unsupported label: ${label}" exit 1 @@ -195,7 +196,7 @@ git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts - ${shell} ${WORKSPACE}/jenkins-scripts/MakeRelease.job --abedir ${WORKSPACE}/abe --target ${target}${tcwg_release:+ --date ${tcwg_release}} --fileserver ${fileserver} --toolchainconfig ${toolchain_config} --binariesdir ${binariesdir}/${target} --logsdir ${logsdir}/${target} + ${shell} ${WORKSPACE}/jenkins-scripts/MakeRelease.job --abedir ${WORKSPACE}/abe ${canadian} --target ${target}${tcwg_release:+ --date ${tcwg_release}} --fileserver ${fileserver} --toolchainconfig ${toolchain_config} --binariesdir ${binariesdir}/${target} --logsdir ${logsdir}/${target}} --buildnumber ${BUILD_NUMBER} if test $? -gt 0; then exit 1 fi |