From f537340c93e41ad5bfee56359a41d59c51a953c9 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Fri, 11 Apr 2025 08:06:34 +0200 Subject: [PATCH] fix: upgrades: do not hardcode versions - upgrading v7.0 to v7.0 is a noop - pprof testing lags behind --- upgrade/test-pprof-upload.sh | 14 ++++++-------- upgrade/upgrade.sh | 6 ++++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/upgrade/test-pprof-upload.sh b/upgrade/test-pprof-upload.sh index 732fae7d..3c10638c 100644 --- a/upgrade/test-pprof-upload.sh +++ b/upgrade/test-pprof-upload.sh @@ -28,15 +28,13 @@ function test_forgejo_pprof() { docker run --name test_pyroscope --rm -d -p 4040:4040 code.forgejo.org/oci/pyroscope:1.12.0 reset_forgejo $UPGRADE_DIR/default-app.ini - log_info "run 7.0" - start 7.0 - test_upload_profiles - stop - log_info "run 9.0" - start 9.0 - test_upload_profiles - stop + for version in $RELEASE_NUMBERS; do + log_info "run $version" + start $version + test_upload_profiles + stop + done docker stop test_pyroscope } diff --git a/upgrade/upgrade.sh b/upgrade/upgrade.sh index 1d95156f..7ef854f0 100755 --- a/upgrade/upgrade.sh +++ b/upgrade/upgrade.sh @@ -30,7 +30,9 @@ function test_successful_upgrades() { log_info "using $config" upgrade_reset $config - version=7.0 + set $RELEASE_NUMBERS + version="$1" + shift log_info "run $version" cleanup_storage start $version @@ -38,7 +40,7 @@ function test_successful_upgrades() { fixture_assert doctor_run $config - for version in $RELEASE_NUMBERS; do + for version in $@; do stop log_info "run $version" start $version