From 27bfecc737cec5afa12443273df22e893cfa3dc6 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Mon, 25 Jun 2018 19:33:11 +0300 Subject: [PATCH 1/3] image_builder: add information about new partitions --- image_builder/autosizer.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/image_builder/autosizer.sh b/image_builder/autosizer.sh index 60dac8ff..191de1dc 100755 --- a/image_builder/autosizer.sh +++ b/image_builder/autosizer.sh @@ -96,3 +96,8 @@ echo -e "\033[0;31m\033[1mSize of result image: $endresult (bytes)\033[0m\033[0m echo "================================================================================" truncate -s $endresult $strImgFile + +echo "================================================================================" +partinfo=`parted -m $strImgFile unit B print` +echo -e "\033[0;31m\033[1mPartition information:\033[0m\033[0m\n$partinfo" +echo "================================================================================" From 204dd97b0081c05ace0740f8d3bf5aba65f7762e Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Tue, 26 Jun 2018 19:49:42 +0300 Subject: [PATCH 2/3] image_builder: remove date from image name --- image_builder/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image_builder/Jenkinsfile b/image_builder/Jenkinsfile index f515948c..e3b28530 100644 --- a/image_builder/Jenkinsfile +++ b/image_builder/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { string(name: 'GWBT_REF', defaultValue: "master") string(name: 'GWBT_URL', defaultValue: "https://github.com/CopterExpress/clever.git") string(name: 'GWBT_FILE', defaultValue: "") - string(name: 'IMAGE_NAME', defaultValue: "\$(cat ${GWBT_FILE} | jq '.repository.name' -r)_${params.GWBT_REF}_\$(cat ${GWBT_FILE} | jq '.release.published_at' -r).img") + string(name: 'IMAGE_NAME', defaultValue: "\$(cat ${GWBT_FILE} | jq '.repository.name' -r)-${params.GWBT_REF}.img") string(name: 'GWBT_EVENT', defaultValue: 'release') booleanParam(name: 'ONLY_PUBLISH', defaultValue: false, description: 'ONLY PUBLISH') string(name: 'BUILD_DIR', defaultValue: '/mnt/hdd_builder/workspace', description: 'Build workspace') From e5552e0a4bd274d03d47aa3c9444a105720d7f9c Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Tue, 24 Jul 2018 15:16:56 +0300 Subject: [PATCH 3/3] image_builder: replace old archive --- image_builder/image_config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/image_builder/image_config.sh b/image_builder/image_config.sh index 0e1e6bcf..3c2f54f1 100755 --- a/image_builder/image_config.sh +++ b/image_builder/image_config.sh @@ -317,6 +317,8 @@ publish_image() { echo -e "\033[0;31m\033[1m$(date) | Zipping complete!\033[0m\033[0m" else echo -e "\033[0;31m\033[1m$(date) | Zip-archive already created\033[0m\033[0m" + cd $1 && rm $2.zip && zip $2.zip $2 + echo -e "\033[0;31m\033[1m$(date) | Old archive was deleted & create new\033[0m\033[0m" fi echo -e "\033[0;31m\033[1m$(date) | Upload image\033[0m\033[0m"