From b5caf4b07ff6da5c0304124950270daa53b2b5d4 Mon Sep 17 00:00:00 2001 From: Ole Petter Date: Fri, 23 Oct 2020 08:53:16 +0200 Subject: [PATCH 1/2] QA-214: Package 'latest' Mender client debian package by default The 'latest' tag is always pointing to the latest released Mender-client. Therefore it is no longer necessary to update the client version on release. Changelog: Package latest released Mender-client by default Signed-off-by: Ole Petter --- .gitlab-ci.yml | 2 +- configs/mender_convert_config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e6891c..7ad2862 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: # These variables are present elsewhere in the repository too. Make sure to # search for and change them too. MENDER_ARTIFACT_VERSION: master - MENDER_CLIENT_VERSION: master + MENDER_CLIENT_VERSION: latest # Make sure to update the link in mender-docs to the new one when changing # this. RASPBIAN_URL: http://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2020-05-28/2020-05-27-raspios-buster-lite-armhf.zip diff --git a/configs/mender_convert_config b/configs/mender_convert_config index 7ed997b..877133d 100644 --- a/configs/mender_convert_config +++ b/configs/mender_convert_config @@ -111,7 +111,7 @@ MENDER_PARTITION_ALIGNMENT="8388608" # Mender client version # # This is used to fetch the correct binaries -MENDER_CLIENT_VERSION="master" +MENDER_CLIENT_VERSION="latest" # File storage, containing binary files, do not modify this unless you know # what you are doing. From 70350d608c370530eb8bc6a92eb223bb0d012dfb Mon Sep 17 00:00:00 2001 From: Ole Petter Date: Wed, 4 Nov 2020 09:50:11 +0100 Subject: [PATCH 2/2] QA-214: Remove the Debian revision suffix for the latest package The latest package does not have the Debian version suffixed. Therefore, simply remove it in the case where it is needed. Changelog: None Signed-off-by: Ole Petter --- mender-convert-modify | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mender-convert-modify b/mender-convert-modify index bebec9b..f5b4c1e 100755 --- a/mender-convert-modify +++ b/mender-convert-modify @@ -100,7 +100,11 @@ mkdir -p work/mender-deb/files log_info "Installing Mender client and related files" deb_arch=$(probe_debian_arch_name) -deb_name="mender-client_${MENDER_CLIENT_VERSION}-1_${deb_arch}.deb" +DEBIAN_REVISION="-1" +if [ "${MENDER_CLIENT_VERSION}" = "latest" ]; then + DEBIAN_REVISION="" +fi +deb_name="mender-client_${MENDER_CLIENT_VERSION}${DEBIAN_REVISION}_${deb_arch}.deb" run_and_log_cmd "wget -Nq ${MENDER_STORAGE_URL}/${MENDER_CLIENT_VERSION}/dist-packages/debian/${deb_arch}/${deb_name} -P work/mender-deb" cd work/mender-deb