From 4f39e0112ff7bf75c2b56a3444d50b6ae809c4f3 Mon Sep 17 00:00:00 2001
From: Thilo Fromm <thilo@kinvolk.io>
Date: Mon, 21 Feb 2022 17:23:53 +0100
Subject: [PATCH] ci-automation/tests.sh: use http in torcx manifest

Use HTTP instead of https because Ignition does not recognise
letsencrypt certificates, leading to test breakage in
docker.torcx-manifest-pkgs.

Add a note in settings.env to explicitly call out HTTP requirement of
build cache server.

Signed-off-by: Thilo Fromm <thilo@kinvolk.io>
---
 ci-automation/ci-config.env | 4 ++++
 ci-automation/test.sh       | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ci-automation/ci-config.env b/ci-automation/ci-config.env
index 34ca3eaf21..deac6763cf 100644
--- a/ci-automation/ci-config.env
+++ b/ci-automation/ci-config.env
@@ -4,6 +4,10 @@
 
 # Flatcar CI static configuration
 
+# Build cache server for build artifacts.
+#  Required services:
+#  - http and https (WITHOUT auto-redirect)
+#  - ssh for BUILDCACHE_USER
 BUILDCACHE_SERVER="bincache.flatcar-linux.net"
 BUILDCACHE_PATH_PREFIX="/srv/bincache"
 BUILDCACHE_USER="bincache"
diff --git a/ci-automation/test.sh b/ci-automation/test.sh
index 86b3077cfe..07df9ca2fc 100644
--- a/ci-automation/test.sh
+++ b/ci-automation/test.sh
@@ -84,7 +84,8 @@ function __prepare_torcx() {
                         ${workdir}/torcx_manifest.json)")"
 
     # Add docker package URL on build cache to manifest
-    jq ".value.packages[0].versions[0].locations += [{\"url\" : \"https://${BUILDCACHE_SERVER}/images/${arch}/${vernum}/${docker_pkg}\"}]" \
+    local docker_url="http://${BUILDCACHE_SERVER}/images/${arch}/${vernum}/torcx/${docker_pkg}"
+    jq ".value.packages[0].versions[0].locations += [{\"url\" : \"${docker_url}\"}]" \
         "${workdir}/torcx_manifest.json" \
         > "${workdir}/torcx_manifest_new.json"