From f7a050c30956897e3db11a6e04a6d53066c4168e Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Thu, 20 Aug 2020 11:34:11 +0200 Subject: [PATCH 1/2] [run-tests.sh] Update RPi3 Ubuntu image for testing Previous version 18.04.4 throws 404 Changelog: None Signed-off-by: Lluis Campos --- scripts/test/run-tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/test/run-tests.sh b/scripts/test/run-tests.sh index d199e6b..a3e89d3 100755 --- a/scripts/test/run-tests.sh +++ b/scripts/test/run-tests.sh @@ -23,7 +23,7 @@ TINKER_IMAGE_URL="http://dlcdnet.asus.com/pub/ASUS/mb/Linux/Tinker_Board_2GB/201 UBUNTU_IMAGE_URL="https://d1b0l86ne08fsf.cloudfront.net/mender-convert/images/Ubuntu-Bionic-x86-64.img.gz" -UBUNTU_SERVER_RPI_IMAGE_URL="http://cdimage.ubuntu.com/ubuntu/releases/bionic/release/ubuntu-18.04.4-preinstalled-server-armhf+raspi3.img.xz" +UBUNTU_SERVER_RPI_IMAGE_URL="http://cdimage.ubuntu.com/ubuntu/releases/bionic/release/ubuntu-18.04.5-preinstalled-server-armhf+raspi3.img.xz" # Keep common function declarations in separate utils script UTILS_PATH=${0/$(basename $0)/test-utils.sh} @@ -120,17 +120,17 @@ else wget --progress=dot:giga -N ${UBUNTU_SERVER_RPI_IMAGE_URL} -P input/ convert_and_test "raspberrypi3" \ "release-1" \ - "input/ubuntu-18.04.4-preinstalled-server-armhf+raspi3.img.xz" \ + "input/ubuntu-18.04.5-preinstalled-server-armhf+raspi3.img.xz" \ "--config configs/raspberrypi3_config" || test_result=$? echo >&2 "----------------------------------------" echo >&2 "Running the uncompressed test" echo >&2 "----------------------------------------" rm -rf deploy - unxz --force "input/ubuntu-18.04.4-preinstalled-server-armhf+raspi3.img.xz" + unxz --force "input/ubuntu-18.04.5-preinstalled-server-armhf+raspi3.img.xz" convert_and_test "raspberrypi3" \ "release-1" \ - "input/ubuntu-18.04.4-preinstalled-server-armhf+raspi3.img" \ + "input/ubuntu-18.04.5-preinstalled-server-armhf+raspi3.img" \ "--config configs/raspberrypi3_config" || test_result=$? fi From ab83422eeeea967a520a7d94dd9ea833c0ca2ff0 Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Thu, 20 Aug 2020 11:36:33 +0200 Subject: [PATCH 2/2] [pipeline] Beautification, move image to the job Changelog: None Signed-off-by: Lluis Campos --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2e4677..9276ec4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,3 @@ -image: docker:git variables: DOCKER_REPOSITORY: mendersoftware/mender-convert @@ -32,6 +31,7 @@ stages: build: stage: build + image: docker:git services: - docker:19.03.5-dind script: