Skip to content

chore: update qemu artifact to noble base #1535

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 24, 2025
Merged

chore: update qemu artifact to noble base #1535

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
9 changes: 0 additions & 9 deletions .github/workflows/qemu-image-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,6 @@ jobs:
VERSION=$(cat common-nix.vars.pkr.hcl | sed -e 's/postgres-version = "\(.*\)"/\1/g')
echo "version=$VERSION" >> $GITHUB_OUTPUT

# - name: Create nix flake revision tarball
# run: |
# GIT_SHA=${{github.sha}}
# MAJOR_VERSION=${{ env.POSTGRES_MAJOR_VERSION }}

# mkdir -p "/tmp/pg_upgrade_bin/${MAJOR_VERSION}"
# echo "$GIT_SHA" >> "/tmp/pg_upgrade_bin/${MAJOR_VERSION}/nix_flake_version"
# tar -czf "/tmp/pg_binaries.tar.gz" -C "/tmp/pg_upgrade_bin" .

- name: configure aws credentials - staging
uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-kubernetes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.21

ADD ./output-cloudimg/packer-cloudimg /disk/focal.qcow2
ADD ./output-cloudimg/packer-cloudimg /disk/image.qcow2

RUN apk add --no-cache qemu-system-aarch64 qemu-img openssh-client nftables cloud-utils-localds aavmf virtiofsd
# dev stuff
Expand Down
4 changes: 0 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ init: qemu-arm64-nix.pkr.hcl
output-cloudimg/packer-cloudimg: ansible qemu-arm64-nix.pkr.hcl
packer build -var "git_sha=$(UPSTREAM_NIX_GIT_SHA)" qemu-arm64-nix.pkr.hcl

disk/focal-raw.img: output-cloudimg/packer-cloudimg
mkdir -p disk
sudo qemu-img convert -O raw output-cloudimg/packer-cloudimg disk/focal-raw.img

alpine-image: output-cloudimg/packer-cloudimg
sudo nerdctl build . -t supabase-postgres-test:$(GIT_SHA) -f ./Dockerfile-kubernetes

Expand Down
4 changes: 2 additions & 2 deletions qemu-arm64-nix.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ source "qemu" "cloudimg" {
format = "qcow2"
headless = true
http_directory = "http"
iso_checksum = "file:https://cloud-images.ubuntu.com/focal/current/SHA256SUMS"
iso_url = "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-arm64.img"
iso_checksum = "file:https://cloud-images.ubuntu.com/noble/current/SHA256SUMS"
iso_url = "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-arm64.img"
memory = 40000
qemu_binary = "qemu-system-aarch64"
qemuargs = [
Expand Down
3 changes: 0 additions & 3 deletions scripts/90-cleanup-qemu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ elif [ -n "$(command -v apt-get)" ]; then
autoconf \
autotools-dev \
cmake-data \
cpp-8 \
cpp-9 \
cpp-10 \
gcc-8 \
gcc-9 \
gcc-10 \
git \
Expand All @@ -43,7 +41,6 @@ elif [ -n "$(command -v apt-get)" ]; then
add-apt-repository --yes --remove ppa:ansible/ansible

source /etc/os-release
apt-get -y remove --purge linux-headers-5.11.0-1021-aws

apt-get -y update
apt-get -y upgrade
Expand Down
Loading