Skip to content

fix: skip installing ndisc issue resolver in qemu mode #1519

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 2 commits into from
Apr 3, 2025
Merged

fix: skip installing ndisc issue resolver in qemu mode #1519

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
f19dcbf
fix: skip installing ndisc issue resolver in qemu mode
darora Apr 3, 2025
809cfa0
fix: update adminapi service for qemu builds
darora Apr 3, 2025
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
3 changes: 3 additions & 0 deletions ansible/files/adminapi.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ User=adminapi
Restart=always
RestartSec=3
Environment="AWS_USE_DUALSTACK_ENDPOINT=true"
{% if qemu_mode is defined and qemu_mode %}
Environment="AWS_SDK_LOAD_CONFIG=true"
{% endif %}

[Install]
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion ansible/playbook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
import_tasks: tasks/fix_ipv6_ndisc.yml
tags:
- install-supabase-internal
when: debpkg_mode or nixpkg_mode
when: (debpkg_mode or nixpkg_mode) and (qemu_mode is undefined)

- name: Start Postgres Database without Systemd
become: yes
Expand Down
6 changes: 3 additions & 3 deletions ansible/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ postgres_major:

# Full version strings for each major version
postgres_release:
postgresorioledb-17: "17.0.1.57-orioledb"
postgres17: "17.4.1.007"
postgres15: "15.8.1.064"
postgresorioledb-17: "17.0.1.58-orioledb"
postgres17: "17.4.1.008"
postgres15: "15.8.1.065"

# Non Postgres Extensions
pgbouncer_release: "1.19.0"
Expand Down
2 changes: 1 addition & 1 deletion ebssurrogate/scripts/qemu-bootstrap-nix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ callbacks_enabled = timer, profile_tasks, profile_roles
EOF
# Run Ansible playbook
export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/mnt/tmp
ansible-playbook ./ansible/playbook.yml --extra-vars '{"nixpkg_mode": true, "debpkg_mode": false, "stage2_nix": false}' \
ansible-playbook ./ansible/playbook.yml --extra-vars '{"nixpkg_mode": true, "debpkg_mode": false, "stage2_nix": false, "qemu_mode": true}' \
--extra-vars "postgresql_version=postgresql_${POSTGRES_MAJOR_VERSION}" \
--extra-vars "postgresql_major_version=${POSTGRES_MAJOR_VERSION}" \
--extra-vars "postgresql_major=${POSTGRES_MAJOR_VERSION}" \
Expand Down