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>
This commit is contained in:
Thilo Fromm 2022-02-21 17:23:53 +01:00
parent 0fa985b872
commit 4f39e0112f
2 changed files with 6 additions and 1 deletions

View File

@ -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"

View File

@ -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"