Skip to content

fix: change qemu build to oriole #1512

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
merged 1 commit into from
Apr 2, 2025
Merged

fix: change qemu build to oriole #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/qemu-image-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set PostgreSQL versions - only builds pg17 atm
id: set-versions
run: |
VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[1]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[2]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT

build:
Expand Down
2 changes: 1 addition & 1 deletion ansible/tasks/setup-postgres.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
LOCALE_ARCHIVE: /usr/lib/locale/locale-archive
vars:
ansible_command_timeout: 60
when: stage2_nix and is_psql_oriole or is_psql_17
when: stage2_nix and (is_psql_oriole or is_psql_17)

- name: copy PG systemd unit
template:
Expand Down
9 changes: 7 additions & 2 deletions ebssurrogate/scripts/qemu-bootstrap-nix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ EOF

function clean_legacy_things {
# removes things that are bundled for legacy reasons, but we can start without for our newer artifacts
apt-get unmark zlib1g* # TODO (darora): need to make sure that there aren't other things that still need this
apt-mark auto zlib1g* # TODO (darora): need to make sure that there aren't other things that still need this
apt-get -y purge kong
apt-get autoremove -y
}
Expand Down Expand Up @@ -135,7 +135,12 @@ function clean_system {
mkdir /var/log/sysstat

chown -R postgres:postgres /var/log/wal-g
chmod -R 0300 /var/log/wal-g
# moving up fixes from init scripts
chmod -R 0310 /var/log/wal-g
chmod 0340 /var/log/wal-g/pitr.log

chmod 0600 /etc/vector/vector.yaml
chown vector:vector /etc/vector/vector.yaml

# # audit logs directory for apparmor
mkdir /var/log/audit
Expand Down
Loading