diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2017-05-15 07:43:23 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2017-05-22 11:05:06 +0000 |
| commit | 6082437a54746abdbfb16e1bbbba44640bdd10f2 (patch) | |
| tree | 38a3f7c6fb257bd4da0f9130e6c924a02a5d8be3 | |
| parent | 61d3f705c18b6663f5934bc9427dce3e053a6b70 (diff) | |
jenkins.sh: Remove use of Jenkins env variables.
Since these variables are not propagated to the containers,
stop using the empty values for: NODE_NAME, JOB_NAME,
BUILD_USER_FIRST_NAME, BUILD_USER_LAST_NAME, BUILD_USER_ID.
This patch removes the use of BUILD_URL only when printing it
to the manifest, and does not remove the uses of BUILD_URL
when acquiring the build lock, which should be done in a
later patch.
Change-Id: I3f4677cb174c3d8604fb0c57a4de39e38d4187ce
| -rwxr-xr-x | jenkins.sh | 31 |
1 files changed, 2 insertions, 29 deletions
@@ -140,15 +140,6 @@ fi # set default values for options to make life easier user_snapshots="${user_workspace}/snapshots" -# Non matrix builds use node_selector, but matrix builds use NODE_NAME -if test x"${node_selector}" != x; then - node="$(echo ${node_selector} | tr '-' '_')" - job=${JOB_NAME} -else - node="$(echo ${NODE_NAME} | tr '-' '_')" - job="$(echo ${JOB_NAME} | cut -d '/' -f 1)" -fi - arch="$(uname -m)" if [ x"$logserver" = x"" -a x"$logname" != x"" ]; then @@ -412,28 +403,10 @@ else date=${release} fi -# This is the remote directory for tcwgweb where all test results and log -# files get copied too. - -# These fields are enabled by the buikd-user-vars plugin. -if test x"${BUILD_USER_FIRST_NAME}" != x; then - requestor="-${BUILD_USER_FIRST_NAME}" -fi -if test x"${BUILD_USER_LAST_NAME}" != x; then - requestor="${requestor}.${BUILD_USER_LAST_NAME}" -fi - -echo "Build by ${requestor} on ${NODE_NAME} with parameters: $orig_parameters" +echo "Build parameters: $orig_parameters" manifest="$(read_var ${user_workspace}/build-artifacts.txt manifest)" -if test x"${manifest}" != x; then - echo "node=${node}" >> ${manifest} - echo "requestor=${requestor}" >> ${manifest} - if test x"${BUILD_USER_ID}" != x; then - echo "email=${BUILD_USER_ID}" >> ${manifest} - fi - echo "build_url=${BUILD_URL}" >> ${manifest} -else +if test x"${manifest}" = x; then echo "ERROR: No manifest file, build probably failed!" fi |