lib: move forgejocli to the forgejo instance WORK_PATH

Instead of having it in $DIR so that there can be one forgejocli per
forgejo instance.
This commit is contained in:
Earl Warren 2024-06-04 14:41:56 +02:00
parent 2461666aca
commit b62866f3ae
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 22 additions and 16 deletions

View file

@ -4,7 +4,7 @@ UPGRADE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
function upgrade_reset() {
local config=$1
reset_forgejo $UPGRADE_DIR/$config-app.ini
reset_forgejo $config
reset_minio
}
@ -26,8 +26,8 @@ function cleanup_storage() {
function test_successful_upgrades() {
stop
for config in default ; do
log_info "using $config app.ini"
for config in $UPGRADE_DIR/default-app.ini ; do
log_info "using $config"
upgrade_reset $config
version=1.21
@ -36,7 +36,7 @@ function test_successful_upgrades() {
start $version
fixture_create
fixture_assert
doctor_run $version
doctor_run $config
for version in $RELEASE_NUMBERS_AND_DEV ; do
stop
@ -44,7 +44,7 @@ function test_successful_upgrades() {
start $version
verify_storage
fixture_assert
doctor_run $version
doctor_run $config
done
done
}
@ -68,8 +68,8 @@ function start_gitea() {
function test_gitea_upgrades() {
stop
for config in default ; do
log_info "using $config app.ini"
for config in $UPGRADE_DIR/default-app.ini ; do
log_info "using $config"
upgrade_reset $config
version=1.21.10
@ -79,7 +79,7 @@ function test_gitea_upgrades() {
start_gitea $version
fixture_create
fixture_assert
doctor_run $version
doctor_run $config
for version in 7.0-test ; do
stop
@ -87,7 +87,7 @@ function test_gitea_upgrades() {
start $version
verify_storage
fixture_assert
doctor_run $version
doctor_run $config
done
done
}