Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publish raw and flasher images separately #193

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Publish raw and flasher images separately #193

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4771e4d
jenkins_build.sh: rename resin-flasher.img to balena-flasher.img
mtoman Nov 20, 2020
9b5f5d2
jenkins_build.sh: publish explicitly named balena-raw and balena-flas…
mtoman Nov 20, 2020
1b34cd9
jenkins_build.sh: refactor the code for balena.img handling
mtoman Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 32 additions & 17 deletions automation/jenkins_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,9 @@ deploy_build () {
cp -v "$YOCTO_BUILD_DEPLOY/kernel_modules_headers.tar.gz" "$_deploy_dir" || true
cp -v "$YOCTO_BUILD_DEPLOY/kernel_source.tar.gz" "$_deploy_dir" || true
cp -v "$MACHINE.svg" "$_deploy_dir/logo.svg"
if [ "${_compressed}" != 'true' ]; then
# uncompressed, just copy and we're done
cp -v $(readlink --canonicalize "$YOCTO_BUILD_DEPLOY/$_deploy_artifact") "$_deploy_dir/image/balena.img"
if [ -n "$_deploy_flasher_artifact" ]; then
cp -v $(readlink --canonicalize "$YOCTO_BUILD_DEPLOY/$_deploy_flasher_artifact") "$_deploy_dir/image/resin-flasher.img"
fi
return
fi

if [ "${_archive}" = 'true' ]; then
if [ "${_archive}" = 'true' ] && [ "${_compressed}" = 'true' ]; then
# Archive and we are done
cp -rv "$YOCTO_BUILD_DEPLOY"/"$_deploy_artifact"/* "$_deploy_dir"/image/
(cd "$_deploy_dir/image/" && zip -r "../$_deploy_artifact.zip" .)
if [ -n "$_deploy_flasher_artifact" ]; then
Expand All @@ -103,18 +96,40 @@ deploy_build () {
if [ "$_remove_compressed_file" = "true" ]; then
rm -rf $_deploy_dir/image
fi
return
fi

cp -v $(readlink --canonicalize "$YOCTO_BUILD_DEPLOY/$_deploy_artifact") "$_deploy_dir/image/balena-raw.img"
if [ -n "$_deploy_flasher_artifact" ]; then
cp -v $(readlink --canonicalize "$YOCTO_BUILD_DEPLOY/$_deploy_flasher_artifact") "$_deploy_dir/image/balena-flasher.img"
elif [ "$_image" = "resin-image-flasher" ]; then
# deployFlasherArtifact is not set and deployArtifact contains flasher
mv "$_deploy_dir/image/balena-raw.img" "$_deploy_dir/image/balena-flasher.img"
fi

# Create the unflagged balena.img for backwards compatibility
if [ "$_image" = "resin-image-flasher" ]; then
cp -v "$_deploy_dir/image/balena-flasher.img" "$_deploy_dir/image/balena.img"
else
cp -v $(readlink --canonicalize "$YOCTO_BUILD_DEPLOY/$_deploy_artifact") "$_deploy_dir/image/balena.img"
(cd "$_deploy_dir/image" && zip balena.img.zip balena.img)
if [ -n "$_deploy_flasher_artifact" ]; then
cp -v $(readlink --canonicalize "$YOCTO_BUILD_DEPLOY/$_deploy_flasher_artifact") "$_deploy_dir/image/resin-flasher.img"
(cd "$_deploy_dir/image" && zip resin-flasher.img.zip resin-flasher.img)
cp -v "$_deploy_dir/image/balena-raw.img" "$_deploy_dir/image/balena.img"
fi

if [ "${_compressed}" != 'true' ]; then
# uncompressed, just copy and we're done
return
fi

for filename in balena.img balena-raw.img balena-flasher.img; do
if [ ! -f "$_deploy_dir/image/$filename" ]; then
continue
fi

(cd "$_deploy_dir/image" && zip "$filename.zip" "$filename")

if [ "$_remove_compressed_file" = "true" ]; then
rm -rf $_deploy_dir/image/balena.img
rm -rf $_deploy_dir/image/resin-flasher.img
rm -rf "$_deploy_dir/image/$filename"
fi
fi
done

if [ -d "${WORKSPACE}/layers/meta-balena/tests" ]
then
Expand Down