From 795a099f388ccfe871a129a0cc2e767b554804f9 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sun, 30 Jul 2023 20:33:14 +0300 Subject: [PATCH] ci/baremetal: do not install curl, it's already there curl is already installed in these images, drop it. Acked-by: Emma Anholt Reviewed-by: Christian Gmeiner Reviewed-by: Eric Engestrom Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/bare-metal/cros-servo.sh | 1 - .gitlab-ci/bare-metal/fastboot.sh | 2 -- .gitlab-ci/bare-metal/poe-powered.sh | 1 - 3 files changed, 4 deletions(-) diff --git a/.gitlab-ci/bare-metal/cros-servo.sh b/.gitlab-ci/bare-metal/cros-servo.sh index a790a4e81d4..d2c8924880d 100755 --- a/.gitlab-ci/bare-metal/cros-servo.sh +++ b/.gitlab-ci/bare-metal/cros-servo.sh @@ -83,7 +83,6 @@ mkdir -p /nfs/results rm -rf /tftp/* if echo "$BM_KERNEL" | grep -q http; then - apt-get install -y curl curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ $BM_KERNEL -o /tftp/vmlinuz else diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh index a7fa17137ae..c30a688abec 100755 --- a/.gitlab-ci/bare-metal/fastboot.sh +++ b/.gitlab-ci/bare-metal/fastboot.sh @@ -105,8 +105,6 @@ fi # moving that container to the runner. So, if BM_KERNEL+BM_DTB are URLs, # fetch them instead of looking in the container. if echo "$BM_KERNEL $BM_DTB" | grep -q http; then - apt-get install -y curl - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ "$BM_KERNEL" -o kernel curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ diff --git a/.gitlab-ci/bare-metal/poe-powered.sh b/.gitlab-ci/bare-metal/poe-powered.sh index 1724b55d098..399384f9cd8 100755 --- a/.gitlab-ci/bare-metal/poe-powered.sh +++ b/.gitlab-ci/bare-metal/poe-powered.sh @@ -91,7 +91,6 @@ date +'%F %T' # If BM_BOOTFS is an URL, download it if echo $BM_BOOTFS | grep -q http; then - apt-get install -y curl curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ "${FDO_HTTP_CACHE_URI:-}$BM_BOOTFS" -o /tmp/bootfs.tar BM_BOOTFS=/tmp/bootfs.tar