From b92f1a33fda78fa5e6e5bd25d1e32dc198a2cef0 Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Tue, 14 Sep 2021 10:28:42 +0200 Subject: [PATCH] pre-converted images: remove client version from Artifact name The client is not being installed anymore in the pre-converted images, so this version string baked in into the Artifact name is misleading. Changelog: RPi pre-converted images: remove Mender client version from Artifact name. Signed-off-by: Lluis Campos --- .gitlab-ci.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c42b00..91c9000 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,14 +98,10 @@ test:check-shell-formatting: - unzip ${RASPBIAN_NAME}.zip script: - - echo "MENDER_CLIENT_VERSION=${MENDER_CLIENT_VERSION}" > versions_override_config - - echo "MENDER_ADDON_CONNECT_VERSION=${MENDER_ADDON_CONNECT_VERSION}" >> versions_override_config - - echo "MENDER_ADDON_CONFIGURE_VERSION=${MENDER_ADDON_CONFIGURE_VERSION}" >> versions_override_config - - env MENDER_ARTIFACT_NAME=${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION} - ./docker-mender-convert -d ${RASPBIAN_NAME}.img - -c configs/${RASPBERRYPI_PLATFORM}_config - -c configs/images/raspberrypi_raspbian_config - -c versions_override_config + - env MENDER_ARTIFACT_NAME=${RASPBIAN_NAME}-mender + ./docker-mender-convert --disk-image ${RASPBIAN_NAME}.img + --config configs/${RASPBERRYPI_PLATFORM}_config + --config configs/images/raspberrypi_raspbian_config # Collect artifacts. - mv deploy ${RASPBERRYPI_PLATFORM}