Merge pull request #341 from kacf/master

Several fixes for new release of mender-convert.

.gitlab-ci.yml

@@ -7,7 +7,7 @@ variables:
   MENDER_ARTIFACT_VERSION: master
   MENDER_CLIENT_VERSION: latest
   MENDER_ADDON_CONNECT_VERSION: latest
-  MENDER_ADDON_CONFIGURE_VERSION: master
+  MENDER_ADDON_CONFIGURE_VERSION: latest
   # Make sure to update the link in mender-docs to the new one when changing
   # this.
   RASPBIAN_URL: https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-01-12/2021-01-11-raspios-buster-armhf-lite.zip
@@ -230,11 +230,6 @@ test_acceptance_raspberrypi:
   script:
     - ./scripts/test/run-tests.sh --only raspberrypi3
 
-test_acceptance_linaro-alip:
-  <<: *test_acceptance
-  script:
-    - ./scripts/test/run-tests.sh --only linaro-alip
-
 test_acceptance_beaglebone:
   <<: *test_acceptance
   script:

configs/images/raspberrypi_raspbian_config

@@ -46,14 +46,3 @@ EOF
 }
 
 PLATFORM_MODIFY_HOOKS+=(grow_data_partition)
-
-#
-# Create the Mender Configure state folder in the data partition and symlink it
-#
-function create_mender_configure_state_folder_data_partition() {
-    log_info "Creating the Mender Configure state folder in the data partition"
-    run_and_log_cmd "sudo mkdir -p work/rootfs/data/mender-configure"
-    run_and_log_cmd "sudo ln -sf /data/mender-configure work/rootfs/var/lib/mender-configure"
-}
-
-PLATFORM_MODIFY_HOOKS+=(create_mender_configure_state_folder_data_partition)

configs/mender_convert_config

@@ -136,8 +136,7 @@ MENDER_ADDON_CONFIGURE_INSTALL="n"
 # Mender Configure addon version
 #
 # Valid values are "latest" (default), "master" or a specific version
-#MENDER_ADDON_CONFIGURE_VERSION="latest"
-MENDER_ADDON_CONFIGURE_VERSION="master"
+MENDER_ADDON_CONFIGURE_VERSION="latest"
 
 # File storage, containing binary files, do not modify this unless you know
 # what you are doing.

mender-convert-modify

@@ -155,11 +155,15 @@ if [ "${MENDER_ADDON_CONFIGURE_INSTALL}" = "y" ]; then
     fi
 
     deb_extract_package "work/deb-packages/${deb_name}" "work/rootfs/"
-
-    run_and_log_cmd "sudo mkdir -p work/rootfs/data/mender-configure"
-    run_and_log_cmd "sudo ln -sf /data/mender-configure work/rootfs/var/lib/mender-configure"
 fi
 
+# Do this unconditionally even if not installing mender-configure. The reason is
+# that if the Debian package is installed later, this folder has to preexist. It
+# is part of the rootfs setup, independently of the software.
+log_info "Creating the Mender Configure state folder in the data partition"
+run_and_log_cmd "sudo mkdir -p work/rootfs/data/mender-configure"
+run_and_log_cmd "sudo ln -sf /data/mender-configure work/rootfs/var/lib/mender-configure"
+
 if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then
     # Check for known U-Boot problems in all files on the boot partition.
     check_for_broken_uboot_uefi_support work/boot

scripts/test/run-tests.sh

@@ -26,9 +26,6 @@ BBB_DEBIAN_EMMC_IMAGE_URL="https://rcn-ee.com/rootfs/bb.org/testing/2021-04-05/b
 ## Auto-update
 RASPBIAN_IMAGE_URL="http://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2020-02-14/2020-02-13-raspbian-buster-lite.zip"
 
-## Auto-update
-TINKER_IMAGE_URL="https://dlcdnets.asus.com/pub/ASUS/mb/Linux/Tinker_Board_2GB/20190821-tinker-board-linaro-stretch-alip-v2.0.11.img.zip"
-
 UBUNTU_IMAGE_URL="https://downloads.mender.io/mender-convert/images/Ubuntu-Bionic-x86-64.img.gz"
 
 ## Auto-update
@@ -94,19 +91,6 @@ else
                      || test_result=$?
   fi
 
-  if [ "$1" == "--all" -o "$1" == "--only" -a "$2" == "linaro-alip" ]; then
-    # MEN-2809: Disabled due broken download link
-    #convert_and_test "linaro-alip" \
-    #                 "release-1" \
-    #                 "${TINKER_IMAGE_URL}" \
-    #                 "${TINKER_IMAGE}.img" \
-    #                 "${TINKER_IMAGE}.zip" \
-    #                 -- \
-    #                 "-k" "'not test_update'" \
-    #                 || test_result=$?
-    true
-  fi
-
   if [ "$1" == "--all" -o "$1" == "--only" -a "$2" == "beaglebone" ]; then
     wget --progress=dot:giga -N ${BBB_DEBIAN_SDCARD_IMAGE_URL} -P input/
     BBB_DEBIAN_SDCARD_IMAGE_COMPRESSED="${BBB_DEBIAN_SDCARD_IMAGE_URL##*/}"