From b596a7ad7214d759b964117ba94edb9e32e1d1b5 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 26 Apr 2022 15:00:31 +0900 Subject: [PATCH] CI: Support comparing to current LTS and updating from it When the restriction that the CI can't access the LTS release is gone we can support to run the image comparison and the kola update test. --- ci-automation/vendor-testing/qemu_update.sh | 4 ---- jenkins/images.sh | 5 ----- 2 files changed, 9 deletions(-) diff --git a/ci-automation/vendor-testing/qemu_update.sh b/ci-automation/vendor-testing/qemu_update.sh index c8276cc875..2ecc26e992 100755 --- a/ci-automation/vendor-testing/qemu_update.sh +++ b/ci-automation/vendor-testing/qemu_update.sh @@ -41,10 +41,6 @@ if [ "${ON_CHANNEL}" = "developer" ]; then # For main/dev builds we compare to last alpha release ON_CHANNEL="alpha" fi -if [ "${ON_CHANNEL}" = "lts" ]; then - echo "Updating from previous LTS is not supported yet (needs creds), fallback to Stable" - ON_CHANNEL="stable" -fi if [ -f tmp/flatcar_production_image_previous.bin ] ; then echo "++++ QEMU test: Using existing ${work_dir}/tmp/flatcar_production_image_previous.bin for testing update to ${vernum} (${arch}) from previous ${ON_CHANNEL} ++++" else diff --git a/jenkins/images.sh b/jenkins/images.sh index 4bc5a6baa3..29f1208216 100755 --- a/jenkins/images.sh +++ b/jenkins/images.sh @@ -141,11 +141,6 @@ else export CHANNEL_A="${CHANNEL_BASE}" fi -if [ "${CHANNEL_A}" = "lts" ]; then - echo "Comparing to LTS is not supported yet (needs creds)" - exit 0 -fi - export VERSION_A=$(curl -s -S -f -L "https://${CHANNEL_A}.release.flatcar-linux.net/${BOARD}/current/version.txt" | grep -m 1 "FLATCAR_VERSION=" | cut -d "=" -f 2) if [ "${GROUP}" = "developer" ]; then