diff --git a/pipelines/parts/download-prerequisites.Jenkinsfile b/pipelines/parts/download-prerequisites.Jenkinsfile index 9ac02b0..3742637 100644 --- a/pipelines/parts/download-prerequisites.Jenkinsfile +++ b/pipelines/parts/download-prerequisites.Jenkinsfile @@ -52,11 +52,6 @@ pipeline { } } post { - always { - notAborted { - sh ("${Constants.SCRIPTS_DIR}/archive-prerequisites.sh") - } - } cleanup { cleanupPartJob() } diff --git a/scripts/archive-prerequisites.sh b/scripts/archive-prerequisites.sh deleted file mode 100755 index 6955231..0000000 --- a/scripts/archive-prerequisites.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# -# Copyright (c) 2022 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -set -e -source $(dirname "$0")/lib/job_utils.sh - -require_job_env BUILD_RT - -load_build_env - -set -x - -if [[ -d "$BUILD_HOME/mirrors" ]] ; then - mkdir -p "$BUILD_OUTPUT_HOME" - ln -sfn "$BUILD_HOME/mirrors" "$BUILD_OUTPUT_HOME/" -fi diff --git a/scripts/publish-packages.sh b/scripts/publish-packages.sh index 384a3d9..ee50032 100755 --- a/scripts/publish-packages.sh +++ b/scripts/publish-packages.sh @@ -128,7 +128,7 @@ find_3rdparty_binaries() { } publish_3rdparty_binaries() { - local src_dir="$BUILD_OUTPUT_HOME/mirrors/starlingx/binaries" + local src_dir="$BUILD_HOME/mirrors/starlingx/binaries" local dst_dir="$PUBLISH_DIR/inputs/packages" local checksum_files_list_file="$TEMP_DIR/published_3rdparty_binaries_checksum_files" local checksum_file="$dst_dir/$CHECKSUMS_FILENAME" @@ -165,7 +165,7 @@ publish_3rdparty_binaries() { } publish_3rdparty_sources() { - local src_root_dir="$BUILD_OUTPUT_HOME/mirrors/starlingx/sources" + local src_root_dir="$BUILD_HOME/mirrors/starlingx/sources" local dst_root_dir="$PUBLISH_DIR/inputs/sources" local checksum_files_list_file="$TEMP_DIR/published_3rdparty_sources_checksum_files" local req_sources_file="$BUILD_OUTPUT_HOME/$WORKSPACE_ROOT_SUBDIR/required_downloads/sources.txt"