Skip to content

Finished postgresql deps upgrade by adjusting regex for when migrations are needed #1522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craigcomstock merged 2 commits into from
Nov 18, 2024
Merged

Finished postgresql deps upgrade by adjusting regex for when migrations are needed #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c76b28a
Adjusted tests to capture install log files in a way that github can …
craigcomstock Nov 18, 2024
bbe65a9
Finished postgresql deps upgrade by adjusting regex for when migratio…
craigcomstock Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/deployment-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function failure() {
if command cf-support; then
sudo cf-support --yes > $$.cfsupportlog 2>&1 || cat $$.cfsupportlog
else
cp /var/log/CFEngine-Install* . # ${NTECH_ROOT}/artifacts cd previously
tar cf "${NTECH_ROOT}/artifacts/CFEngine-Install.logs.tgz /var/log/CFEngine-Install*"
fi
rm $$.cfsupportlog
}
Expand Down
4 changes: 2 additions & 2 deletions packaging/common/cfengine-hub/preinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ if is_upgrade; then
fi
fi

# If upgrading from a version below 3.21 that has PostgreSQL, and the data dir exists.
if is_upgrade && egrep '^3\.([6-9]|1[0-9]|2[0-3])\.' "$PREFIX/UPGRADED_FROM.txt" >/dev/null && [ -d "$PREFIX/state/pg/data" ]; then
# When PostgreSQL changes major version we need to migrate. CFEngine 3.25 uses PostgreSQL 17.0 so any version 3.24 or older needs migration.
if is_upgrade && egrep '^3\.([6-9]|1[0-9]|2[0-4])\.' "$PREFIX/UPGRADED_FROM.txt" >/dev/null && [ -d "$PREFIX/state/pg/data" ]; then
alias migrating_postgres='true'
else
alias migrating_postgres='false'
Expand Down
Loading