diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-04-06 09:19:37 -0700 |
|---|---|---|
| committer | Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-04-06 09:19:37 -0700 |
| commit | 5a179cd4ac1b3389cbf1fb20d0c25d0ac2f31380 (patch) | |
| tree | e77cf4b679c73f65687c07afd6529422937dacda | |
| parent | fbbf74b47e523b927463e9ccf3e8f42a296796b3 (diff) | |
Fix bad JJB escaping
The shiplogs script is being included as an include-raw instead of
include-raw-escape and therefore any JJB escaping that it may have needs
to be removed.
Change-Id: I1a883461464eb79a7d6fd73673e994c3abeaa3a0
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
| -rw-r--r-- | jjb/include-raw-deploy-archives.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh index bfe0bcbc7..8f63b0e2f 100644 --- a/jjb/include-raw-deploy-archives.sh +++ b/jjb/include-raw-deploy-archives.sh @@ -56,10 +56,10 @@ EOF mkdir -p $ARCHIVES_DIR mkdir -p $WORKSPACE/archives -if [ ! -z "${{ARCHIVE_ARTIFACTS}}" ]; then +if [ ! -z "${ARCHIVE_ARTIFACTS}" ]; then pushd $WORKSPACE shopt -s globstar # Enable globstar to copy archives - archive_artifacts=$(echo ${{ARCHIVE_ARTIFACTS}}) + archive_artifacts=$(echo ${ARCHIVE_ARTIFACTS}) for f in $archive_artifacts; do echo "Archiving $f" mkdir -p $WORKSPACE/archives/$(dirname $f) @@ -73,7 +73,7 @@ fi # Ignore logging if archives doesn't exist mv $WORKSPACE/archives/ $ARCHIVES_DIR > /dev/null 2>&1 touch $ARCHIVES_DIR/_build-details.txt -echo "build-url: ${{BUILD_URL}}" >> $ARCHIVES_DIR/_build-details.txt +echo "build-url: ${BUILD_URL}" >> $ARCHIVES_DIR/_build-details.txt env > $ARCHIVES_DIR/_build-enviroment-variables.txt # capture system info @@ -89,8 +89,8 @@ touch $ARCHIVES_DIR/_sys-info.txt # Magic string used to trim console logs at the appropriate level during wget echo "-----END_OF_BUILD-----" -wget -O $ARCHIVES_DIR/console.log ${{BUILD_URL}}consoleText -wget -O $ARCHIVES_DIR/console-timestamp.log ${{BUILD_URL}}/timestamps?time=HH:mm:ss\&appendLog +wget -O $ARCHIVES_DIR/console.log ${BUILD_URL}consoleText +wget -O $ARCHIVES_DIR/console-timestamp.log ${BUILD_URL}/timestamps?time=HH:mm:ss\&appendLog sed -i '/^-----END_OF_BUILD-----$/,$d' $ARCHIVES_DIR/console.log sed -i '/^.*-----END_OF_BUILD-----$/,$d' $ARCHIVES_DIR/console-timestamp.log |