diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-04-04 16:16:36 +0000 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-04-04 21:59:15 +0200 |
| commit | 5c359621dfff2b3d134547aa3be6cddc245a2a5e (patch) | |
| tree | 96fcaad29c250fb98db9d85f44845d6ee23865dd | |
| parent | 202995dd1a2790d99fec2d4ef3a590d16b5cca3d (diff) | |
| download | vyos-build-5c359621dfff2b3d134547aa3be6cddc245a2a5e.tar.gz vyos-build-5c359621dfff2b3d134547aa3be6cddc245a2a5e.zip | |
build: qemu: do not use symlinks on generated images
Jenkins can not properly deal with symbolic links.
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rwxr-xr-x | scripts/build-qemu-image | 3 | ||||
| -rwxr-xr-x | scripts/copy-image | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 826036ac..5f4f527e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -242,7 +242,7 @@ pipeline { } } failure { - archiveArtifacts artifacts: '**/live-image-amd64.hybrid.iso, packer_build/qemu/*.img', + archiveArtifacts artifacts: '**/build/vyos-*.iso, **/build/vyos-*.qcow2', allowEmptyArchive: true } cleanup { diff --git a/scripts/build-qemu-image b/scripts/build-qemu-image index 7687db36..349f4a5d 100755 --- a/scripts/build-qemu-image +++ b/scripts/build-qemu-image @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2016 VyOS maintainers and contributors +# Copyright (C) 2016-2021 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -31,3 +31,4 @@ export PACKER_LOG=1 mkdir -p "${PACKER_BUILD_DIR}" packer build -only=qemu-image scripts/packer.json +cp "${PACKER_BUILD_DIR}/qemu/vyos_qemu_image.img" "$BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.qcow2" diff --git a/scripts/copy-image b/scripts/copy-image index 15e7cd53..4196d06d 100755 --- a/scripts/copy-image +++ b/scripts/copy-image @@ -4,6 +4,4 @@ BUILD_DIR="$(scripts/query-json build/build-config.json build_dir)" BUILD_ARCH="$(scripts/query-json build/build-config.json architecture)" VERSION="$(cat $BUILD_DIR/version)" -ln -rnsf "$BUILD_DIR/live-image-$BUILD_ARCH.hybrid.iso" "$BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.iso" - - +cp "$BUILD_DIR/live-image-$BUILD_ARCH.hybrid.iso" "$BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.iso" |