From a55adb1287c65606e8ac8f443eda58d3f1e6fbe4 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 21 Oct 2025 15:44:50 +0200
Subject: [PATCH 1/2]  ci-automation/release.sh: use rclone docker image

 rclone was previously called from the Mantle image but it's not the
 case anymore because we need some environment variables (CHANNEL, ARCH,
 etc.)

 Let's switch to the `rclone` Docker image.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
 ci-automation/release.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ci-automation/release.sh b/ci-automation/release.sh
index e362fd0136..131c74d11b 100644
--- a/ci-automation/release.sh
+++ b/ci-automation/release.sh
@@ -167,9 +167,12 @@ function copy_from_bincache_to_bucket() {
     echo "Experimental (i.e ignore if it fails) - copy the images to CloudFlare bucket"
     (
     set +eu
-    rclone --config "${RCLONE_CONFIGURATION_FILE}" \
-      sync \
-      --http-url "https://${BUILDCACHE_SERVER}/images/${arch}/${version}" :http: "r2:flatcar/${channel}/${arch}-usr/${version}"
+    docker run --rm -ti \
+      -v "${RCLONE_CONFIGURATION_FILE}:/opt/rclone.conf:ro" \
+      docker.io/rclone/rclone:1.71.1 \
+        --config "/opt/rclone.conf" \
+        sync \
+        --http-url "https://${BUILDCACHE_SERVER}/images/${arch}/${version}" :http: "r2:flatcar/${channel}/${arch}-usr/${version}"
     # Exit the function cleanly for now:
     true
     )

From d333b4eb55cd9f4a785c8780adbc211d7b2b8cf5 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 22 Oct 2025 13:55:08 +0200
Subject: [PATCH 2/2] ci-automation/release.sh: lift 'experimental' usage

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
 ci-automation/release.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ci-automation/release.sh b/ci-automation/release.sh
index 131c74d11b..cc3a9b840e 100644
--- a/ci-automation/release.sh
+++ b/ci-automation/release.sh
@@ -164,18 +164,13 @@ function copy_from_bincache_to_bucket() {
     local arch="${2}"
     local version="${3}"
 
-    echo "Experimental (i.e ignore if it fails) - copy the images to CloudFlare bucket"
-    (
-    set +eu
+    echo "Copy the images from bincache to CloudFlare bucket"
     docker run --rm -ti \
       -v "${RCLONE_CONFIGURATION_FILE}:/opt/rclone.conf:ro" \
       docker.io/rclone/rclone:1.71.1 \
         --config "/opt/rclone.conf" \
         sync \
         --http-url "https://${BUILDCACHE_SERVER}/images/${arch}/${version}" :http: "r2:flatcar/${channel}/${arch}-usr/${version}"
-    # Exit the function cleanly for now:
-    true
-    )
     # Note: There is no "current" symlink and when switching the release to current we
     # could at a later stage (when the update payloads are selected in Nebraska) either
     # use folder copies where we delete the old "current" folder first, or we could