Skip to content

Commit

Permalink
Copy artifacts in a more precise directory
Browse files Browse the repository at this point in the history
When we will have more than one build, defconfig or toolchain, artifacts
will be overwriteen. So we need a more precise/dedicated directory to
store them.
So let's add ARCH, toolchain and defconfig name in the PATH name.
  • Loading branch information
montjoie authored and aliceinwire committed Feb 16, 2021
1 parent 653a82f commit 39f30cb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ display_lava_url () {
}

configure_lava_boot() {
KERNEL_STORAGE_URL=http://"${STORAGE_SERVER}"/"${BUILDER_NAME}"/"${BUILD_NUMBER}"/bzImage
KERNEL_STORAGE_URL=http://"${STORAGE_SERVER}/${BUILDER_NAME}/$ARCH/${BUILD_NUMBER}/defconfig/gcc/bzImage"
latest_stage3_amd64=$(curl -s http://gentoo.mirrors.ovh.net/gentoo-distfiles/releases/amd64/autobuilds/latest-stage3-amd64.txt)
rootfs_url=$(echo "$latest_stage3_amd64" | awk 'NR==3{ print $1 }')
rootfs_digests_file=$(curl -s http://gentoo.mirrors.ovh.net/gentoo-distfiles/releases/amd64/autobuilds/"$rootfs_url".DIGESTS)
Expand Down
2 changes: 1 addition & 1 deletion to_fileserver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ copy_artifact() {
FDIR="linux-$ARCH-build/$BUILDER_NAME/$BUILD_NUMBER/$defconfig/$toolchain"

IMAGE_PATH="$FDIR/arch/x86/boot/bzImage"
COPY_IMAGE_PATH="${FILESERVER}"/"${BUILDER_NAME}"/"${BUILD_NUMBER}"/
COPY_IMAGE_PATH="${FILESERVER}/${BUILDER_NAME}/$ARCH/${BUILD_NUMBER}/$defconfig/$toolchain/"
echo "DEBUG: copy artifacts from $FDIR to $COPY_IMAGE_PATH"
mkdir -p "${COPY_IMAGE_PATH}"
chmod -R 755 "${COPY_IMAGE_PATH}"
Expand Down

0 comments on commit 39f30cb

Please sign in to comment.