From 427c46dbf95685b0e32bb450198f836580d56d60 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Thu, 8 Aug 2024 16:48:39 +0200 Subject: [PATCH] lib: remove RELEASE_NUMBERS_AND_DEV, use RELEASE_NUMBERS In the lifecycle of vX.Y.Z, all tests are run against vX.Y-test before it is published, including when the tag is pushed because the automated release process now runs end-to-end before pushing the release to forgejo-experimental. Running end-to-end against vX.Y-dev is therefore redundant with at least two other runs with exactly the same SHA (the one before the tag is pushed and the one when the tag is pushed). There would be value in doing that if it allowed to detect race conditions in Forgejo. But such races were not found in the past six months and there is a lot more scrutiny on commits merged in Forgejo which makes it even less likely than it was before. Running the tests on vX.Y instead of also including the built version provide the same coverage and reduces the workload. --- actions/actions.sh | 2 +- federation/federation.sh | 2 +- lib/lib.sh | 1 - packages/alpine-7.0-dev | 1 - .../package-source/forgejo-2173/APKBUILD | 0 .../package-source/forgejo-2173/forgejo_2173 | 0 .../package-source/forgejo-2173/forgejo_2173.init | 0 .../package-source/forgejo-2174/APKBUILD | 0 .../package-source/forgejo-2174/forgejo_2174 | 0 .../package-source/forgejo-2174/forgejo_2174.init | 0 packages/{alpine-7.0-test => alpine-7.0}/test.sh | 0 packages/alpine-9.0 | 1 + packages/alpine-9.0-dev | 1 - storage/storage.sh | 2 +- upgrade/upgrade.sh | 2 +- 15 files changed, 5 insertions(+), 7 deletions(-) delete mode 120000 packages/alpine-7.0-dev rename packages/{alpine-7.0-test => alpine-7.0}/package-source/forgejo-2173/APKBUILD (100%) rename packages/{alpine-7.0-test => alpine-7.0}/package-source/forgejo-2173/forgejo_2173 (100%) rename packages/{alpine-7.0-test => alpine-7.0}/package-source/forgejo-2173/forgejo_2173.init (100%) rename packages/{alpine-7.0-test => alpine-7.0}/package-source/forgejo-2174/APKBUILD (100%) rename packages/{alpine-7.0-test => alpine-7.0}/package-source/forgejo-2174/forgejo_2174 (100%) rename packages/{alpine-7.0-test => alpine-7.0}/package-source/forgejo-2174/forgejo_2174.init (100%) rename packages/{alpine-7.0-test => alpine-7.0}/test.sh (100%) create mode 120000 packages/alpine-9.0 delete mode 120000 packages/alpine-9.0-dev diff --git a/actions/actions.sh b/actions/actions.sh index 089efbf..b411778 100755 --- a/actions/actions.sh +++ b/actions/actions.sh @@ -88,7 +88,7 @@ function actions_runner_version() { } function test_actions() { - local versions="${1:-$RELEASE_NUMBERS_AND_DEV}" + local versions="${1:-$RELEASE_NUMBERS}" for version in $versions; do diff --git a/federation/federation.sh b/federation/federation.sh index f0acfcf..e3e7ab7 100755 --- a/federation/federation.sh +++ b/federation/federation.sh @@ -69,7 +69,7 @@ function test_federation() { # start_gitlab octobus/heptapod:1.5.3 federation_setup_variables - local versions="${1:-$RELEASE_NUMBERS_AND_DEV}" + local versions="${1:-$RELEASE_NUMBERS}" for version in $versions; do diff --git a/lib/lib.sh b/lib/lib.sh index b5101ca..9dc8ee3 100644 --- a/lib/lib.sh +++ b/lib/lib.sh @@ -35,7 +35,6 @@ export DOT_FORGEJO_CURL=$DIR/forgejo-curl export DOT=$DOT_FORGEJO_CURL # for backward compatibility with forgejo-curl.sh 1.0.0 : ${FORGEJO_USER:=root} : ${FORGEJO_PASSWORD:=admin1234} -: ${RELEASE_NUMBERS_AND_DEV:="$(for r in $RELEASE_NUMBERS; do echo -n "$r $r-dev "; done)"} ORGANIZATIONS=$(cat $LIB_DIR/ORGANIZATIONS) function log_info() { diff --git a/packages/alpine-7.0-dev b/packages/alpine-7.0-dev deleted file mode 120000 index a2389c0..0000000 --- a/packages/alpine-7.0-dev +++ /dev/null @@ -1 +0,0 @@ -alpine-7.0-test \ No newline at end of file diff --git a/packages/alpine-7.0-test/package-source/forgejo-2173/APKBUILD b/packages/alpine-7.0/package-source/forgejo-2173/APKBUILD similarity index 100% rename from packages/alpine-7.0-test/package-source/forgejo-2173/APKBUILD rename to packages/alpine-7.0/package-source/forgejo-2173/APKBUILD diff --git a/packages/alpine-7.0-test/package-source/forgejo-2173/forgejo_2173 b/packages/alpine-7.0/package-source/forgejo-2173/forgejo_2173 similarity index 100% rename from packages/alpine-7.0-test/package-source/forgejo-2173/forgejo_2173 rename to packages/alpine-7.0/package-source/forgejo-2173/forgejo_2173 diff --git a/packages/alpine-7.0-test/package-source/forgejo-2173/forgejo_2173.init b/packages/alpine-7.0/package-source/forgejo-2173/forgejo_2173.init similarity index 100% rename from packages/alpine-7.0-test/package-source/forgejo-2173/forgejo_2173.init rename to packages/alpine-7.0/package-source/forgejo-2173/forgejo_2173.init diff --git a/packages/alpine-7.0-test/package-source/forgejo-2174/APKBUILD b/packages/alpine-7.0/package-source/forgejo-2174/APKBUILD similarity index 100% rename from packages/alpine-7.0-test/package-source/forgejo-2174/APKBUILD rename to packages/alpine-7.0/package-source/forgejo-2174/APKBUILD diff --git a/packages/alpine-7.0-test/package-source/forgejo-2174/forgejo_2174 b/packages/alpine-7.0/package-source/forgejo-2174/forgejo_2174 similarity index 100% rename from packages/alpine-7.0-test/package-source/forgejo-2174/forgejo_2174 rename to packages/alpine-7.0/package-source/forgejo-2174/forgejo_2174 diff --git a/packages/alpine-7.0-test/package-source/forgejo-2174/forgejo_2174.init b/packages/alpine-7.0/package-source/forgejo-2174/forgejo_2174.init similarity index 100% rename from packages/alpine-7.0-test/package-source/forgejo-2174/forgejo_2174.init rename to packages/alpine-7.0/package-source/forgejo-2174/forgejo_2174.init diff --git a/packages/alpine-7.0-test/test.sh b/packages/alpine-7.0/test.sh similarity index 100% rename from packages/alpine-7.0-test/test.sh rename to packages/alpine-7.0/test.sh diff --git a/packages/alpine-9.0 b/packages/alpine-9.0 new file mode 120000 index 0000000..b34295a --- /dev/null +++ b/packages/alpine-9.0 @@ -0,0 +1 @@ +alpine-7.0 \ No newline at end of file diff --git a/packages/alpine-9.0-dev b/packages/alpine-9.0-dev deleted file mode 120000 index a2389c0..0000000 --- a/packages/alpine-9.0-dev +++ /dev/null @@ -1 +0,0 @@ -alpine-7.0-test \ No newline at end of file diff --git a/storage/storage.sh b/storage/storage.sh index 6ace098..8fdb64f 100755 --- a/storage/storage.sh +++ b/storage/storage.sh @@ -31,7 +31,7 @@ function test_storage_stable_s3() { local work_path=$DIR/forgejo-work-path local s3_backend=${1:-minio} - for version in $RELEASE_NUMBERS_AND_DEV; do + for version in $RELEASE_NUMBERS; do log_info "Forgejo $version & $s3_backend" stop storage_reset stable-s3 diff --git a/upgrade/upgrade.sh b/upgrade/upgrade.sh index 60e6fac..79c65cc 100755 --- a/upgrade/upgrade.sh +++ b/upgrade/upgrade.sh @@ -38,7 +38,7 @@ function test_successful_upgrades() { fixture_assert doctor_run $config - for version in $RELEASE_NUMBERS_AND_DEV; do + for version in $RELEASE_NUMBERS; do stop log_info "run $version" start $version