From 2be6e2e770f6f9836d12ff10ab5b3bd32e7d6892 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Fri, 4 Dec 2020 16:23:01 -0500 Subject: Use 'lftools deploy archives' for log upload - This is a pre-requisite for using amazon S3 for log storage. - Requires docker images built by updated docker scripts to include packages required by 'lftools' or other project specific docker images to be upgraded with same packages. This change only updates jobs which are using fdiotools docker images. - Add FD.io specific global macros to avoid inflating docker images with packages required by unneeded global-jjb scripts. - Sort VPP job parameters alphabetically - Dump installed python3 packages in setup_executor_env.sh Change-Id: Ifddd8f2b70b10acf834ffc837b27ef5453213a86 Signed-off-by: Dave Wallace --- jjb/scripts/post_build_deploy_archives.sh | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 jjb/scripts/post_build_deploy_archives.sh (limited to 'jjb/scripts/post_build_deploy_archives.sh') diff --git a/jjb/scripts/post_build_deploy_archives.sh b/jjb/scripts/post_build_deploy_archives.sh new file mode 100644 index 000000000..3f68e842b --- /dev/null +++ b/jjb/scripts/post_build_deploy_archives.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +# Copyright (c) 2020 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +echo "---> jjb/scripts/post_build_deploy_archives.sh" + +set +e # Do not affect the build result if some part of archiving fails. +WS_ARCHIVES_DIR="$WORKSPACE/archives" +BUILD_ENV_LOG="$WS_ARCHIVES_DIR/_build-enviroment-variables.log" + +# Log the build environment variables +echo "Logging build environment variables in '$BUILD_ENV_LOG'..." +mkdir -p $WS_ARCHIVES_DIR +env > $BUILD_ENV_LOG + +echo "WS_ARCHIVE_ARTIFACTS = '$WS_ARCHIVE_ARTIFACTS'" +if [ ! -z "${WS_ARCHIVE_ARTIFACTS}" ]; then + pushd $WORKSPACE + shopt -s globstar # Enable globstar to copy archives + archive_artifacts=$(echo ${WS_ARCHIVE_ARTIFACTS}) + for file in $archive_artifacts; do + if [ -f "$file" ] ; then + echo "Archiving '$file'..." + mkdir -p $WS_ARCHIVES_DIR/$(dirname $file) + mv $file $WS_ARCHIVES_DIR/$file + else + echo "Skipping '$file' which is not a file:" + ls -ld $file + fi + done + shopt -u globstar # Disable globstar once archives are copied + popd + # Clean up failed 'make test' archive directories for better + # navigation and legibility of log directories. + if [ -d "$WS_ARCHIVES_DIR/tmp" ] ; then + mv $WS_ARCHIVES_DIR/tmp/* $WS_ARCHIVES_DIR + rmdir $WS_ARCHIVES_DIR/tmp + fi +fi + +# find and gzip any 'text' files +find $WS_ARCHIVES_DIR -type f -print0 \ + | xargs -0r file \ + | egrep -e ':.*text.*' \ + | cut -d: -f1 \ + | xargs -d'\n' -r gzip -- cgit 1.2.3-korg