Skip to content

Commit b9abe56

Browse files
committed
fix: change qemu build to oriole
The array we grab the version from was re-ordered as PG17 non-oriole was introduced. A more robust mechanism can be added later but this array is rarely adjusted, so this is likely good enough for now. Also moves up some fixes from the init-scripts, and removes Kong from the qemu artifact.
1 parent ca3a691 commit b9abe56

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Diff for: .github/workflows/qemu-image-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set PostgreSQL versions - only builds pg17 atm
2727
id: set-versions
2828
run: |
29-
VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[1]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
29+
VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[2]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
3030
echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
3131
3232
build:

Diff for: ansible/tasks/setup-postgres.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
LOCALE_ARCHIVE: /usr/lib/locale/locale-archive
256256
vars:
257257
ansible_command_timeout: 60
258-
when: stage2_nix and is_psql_oriole or is_psql_17
258+
when: stage2_nix and (is_psql_oriole or is_psql_17)
259259

260260
- name: copy PG systemd unit
261261
template:

Diff for: ebssurrogate/scripts/qemu-bootstrap-nix.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ EOF
106106

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

137137
chown -R postgres:postgres /var/log/wal-g
138-
chmod -R 0300 /var/log/wal-g
138+
# moving up fixes from init scripts
139+
chmod -R 0310 /var/log/wal-g
140+
chmod 0340 /var/log/wal-g/pitr.log
141+
142+
chmod 0600 /etc/vector/vector.yaml
143+
chown vector:vector /etc/vector/vector.yaml
139144

140145
# # audit logs directory for apparmor
141146
mkdir /var/log/audit

0 commit comments

Comments
 (0)