pg 15 and 16 packer/ansible/ghactions

.github/workflows/ami-release-nix.yml

@@ -3,17 +3,37 @@ name: Release AMI Nix
 on:
  push:
  branches:
- - develop
- - release/*
+ #- develop
+ #- release/*
+ - sam/15-16-ghactions
  paths:
  - '.github/workflows/ami-release-nix.yml'
  - 'common-nix.vars.pkr.hcl'
+ - 'ansible/vars.yml'
  workflow_dispatch:
 
 jobs:
+ prepare:
+ runs-on: ubuntu-latest
+ outputs:
+ postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
+ steps:
+ - name: Checkout Repo
+ uses: actions/checkout@v3
+
+ - uses: DeterminateSystems/nix-installer-action@main
+
+ - name: Set PostgreSQL versions
+ id: set-versions
+ run: |
+ VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
+ echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
+
  build:
+ needs: prepare
  strategy:
  matrix:
+ postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
  include:
  - runner: arm-runner
  arch: arm64
@@ -31,42 +51,55 @@ jobs:
  - name: Checkout Repo
  uses: actions/checkout@v3
 
+ - uses: DeterminateSystems/nix-installer-action@main
+
  - name: Run checks if triggered manually
  if: ${{ github.event_name == 'workflow_dispatch' }}
- # Update `ci.yaml` too if changing constraints.
  run: |
- SUFFIX=$(sed -E 's/postgres-version = "[0-9\.]+(.*)"/\1/g' common-nix.vars.pkr.hcl)
+ SUFFIX=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres${{ matrix.postgres_version }}"]' ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
  if [[ -z $SUFFIX ]] ; then
  echo "Version must include non-numeric characters if built manually."
  exit 1
  fi
 
- # extensions are build in nix prior to this step
- # so we can just use the binaries from the nix store
- # for postgres, extensions and wrappers
+ - name: Set PostgreSQL version environment variable
+ run: echo "POSTGRES_MAJOR_VERSION=${{ matrix.postgres_version }}" >> $GITHUB_ENV
+
+ - name: Generate common-nix.vars.pkr.hcl
+ run: |
+ PG_VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
+ PG_VERSION=$(echo $PG_VERSION | tr -d '"') # Remove any surrounding quotes
+ echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
+ # Ensure there's a newline at the end of the file
+ echo "" >> common-nix.vars.pkr.hcl
 
  - name: Build AMI stage 1
+ env:
+ POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
  run: |
  packer init amazon-arm64-nix.pkr.hcl
  GIT_SHA=${{github.sha}}
- packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=" amazon-arm64-nix.pkr.hcl
+ packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}"  -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
 
  - name: Build AMI stage 2
+ env:
+ POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
  run: |
  packer init stage2-nix-psql.pkr.hcl
  GIT_SHA=${{github.sha}}
- packer build -var "git_sha=${GIT_SHA}" -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" stage2-nix-psql.pkr.hcl
+ POSTGRES_MAJOR_VERSION=${{ env.POSTGRES_MAJOR_VERSION }}
+ packer build -var "git_sha=${GIT_SHA}" -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var "postgres_major_version=${POSTGRES_MAJOR_VERSION}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" stage2-nix-psql.pkr.hcl
 
  - name: Grab release version
  id: process_release_version
  run: |
- VERSION=$(sed -e 's/postgres-version = "\(.*\)"/\1/g' common-nix.vars.pkr.hcl)
- echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+ 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=$(echo "${{ steps.process_release_version.outputs.version }}" | cut -d. -f1)
+ 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"
@@ -84,17 +117,13 @@ jobs:
  ansible-playbook -i localhost \
  -e "ami_release_version=${{ steps.process_release_version.outputs.version }}" \
  -e "internal_artifacts_bucket=${{ secrets.ARTIFACTS_BUCKET }}" \
+ -e "postgres_major_version=${{ env.POSTGRES_MAJOR_VERSION }}" \
  manifest-playbook.yml
 
  - name: Upload nix flake revision to s3 staging
  run: |
  aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
 
- #Our self hosted github runner already has permissions to publish images 
- #but they're limited to only that; 
- #so if we want s3 access we'll need to config credentials with the below steps 
- # (which overwrites existing perms) after the ami build
-
  - name: configure aws credentials - prod
  uses: aws-actions/configure-aws-credentials@v4
  with:
@@ -107,6 +136,7 @@ jobs:
  ansible-playbook -i localhost \
  -e "ami_release_version=${{ steps.process_release_version.outputs.version }}" \
  -e "internal_artifacts_bucket=${{ secrets.PROD_ARTIFACTS_BUCKET }}" \
+ -e "postgres_major_version=${{ env.POSTGRES_MAJOR_VERSION }}" \
  manifest-playbook.yml
 
  - name: Upload nix flake revision to s3 prod
@@ -130,12 +160,12 @@ jobs:
  SLACK_MESSAGE: 'Building Postgres AMI failed'
  SLACK_FOOTER: ''
 
- - name: Cleanup resources on build cancellation
+ - name: Cleanup resources after build
  if: ${{ always() }}
  run: |
- aws ec2 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -n 1 -I {} aws ec2 terminate-instances --instance-ids {}
+ aws ec2 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --instance-ids
 
  - name: Cleanup resources on build cancellation
  if: ${{ cancelled() }}
  run: |
- aws ec2 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -n 1 -I {} aws ec2 terminate-instances --instance-ids {}
+ aws ec2 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --instance-ids

.github/workflows/test.yml

@@ -8,9 +8,27 @@ on:
  workflow_dispatch:
 
 jobs:
+ prepare:
+ runs-on: ubuntu-latest
+ outputs:
+ postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
+ steps:
+ - name: Checkout Repo
+ uses: actions/checkout@v4
+
+ - uses: DeterminateSystems/nix-installer-action@main
+
+ - name: Set PostgreSQL versions
+ id: set-versions
+ run: |
+ VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
+ echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
+
  build:
+ needs: prepare
  strategy:
  matrix:
+ postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
  include:
  - runner: [self-hosted, X64]
  arch: amd64
@@ -23,14 +41,31 @@ jobs:
  POSTGRES_PASSWORD: password
  steps:
  - uses: actions/checkout@v3
+
+ - uses: DeterminateSystems/nix-installer-action@main
+
+ - name: Set PostgreSQL version environment variable
+ run: echo "POSTGRES_MAJOR_VERSION=${{ matrix.postgres_version }}" >> $GITHUB_ENV
+
+ - name: Generate common-nix.vars.pkr.hcl
+ run: |
+ PG_VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
+ PG_VERSION=$(echo $PG_VERSION | tr -d '"') # Remove any surrounding quotes
+ echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
+ # Ensure there's a newline at the end of the file
+ echo "" >> common-nix.vars.pkr.hcl
+
  - id: settings
  # Remove spaces and quotes to get the raw version string
  run: sed -r 's/(\s|\")+//g' common-nix.vars.pkr.hcl >> $GITHUB_OUTPUT
 
- - id: args
- uses: mikefarah/yq@master
- with:
- cmd: yq 'to_entries | map(select(.value|type == "!!str")) | map(.key + "=" + .value) | join("\n")' 'ansible/vars.yml'
+ - name: Generate args
+ id: args
+ run: |
+ ARGS=$(sudo nix run nixpkgs#yq -- 'to_entries | map(select(.value|type == "!!str")) | map(.key + "=" + .value) | join("\n")' ansible/vars.yml)
+ echo "result<<EOF" >> $GITHUB_OUTPUT
+ echo "$ARGS" >> $GITHUB_OUTPUT
+ echo "EOF" >> $GITHUB_OUTPUT
 
  - run: docker context create builders
  - uses: docker/setup-buildx-action@v3

.github/workflows/testinfra-nix.yml

@@ -5,17 +5,35 @@ on:
  workflow_dispatch:
 
 jobs:
+ prepare:
+ runs-on: ubuntu-latest
+ outputs:
+ postgres_versions: ${{ steps.set-versions.outputs.postgres_versions }}
+ steps:
+ - name: Checkout Repo
+ uses: actions/checkout@v4
+
+ - uses: DeterminateSystems/nix-installer-action@main
+
+ - name: Set PostgreSQL versions
+ id: set-versions
+ run: |
+ VERSIONS=$(nix run nixpkgs#yq -- '.postgres_major[]' ansible/vars.yml | nix run nixpkgs#jq -- -R -s -c 'split("\n")[:-1]')
+ echo "postgres_versions=$VERSIONS" >> $GITHUB_OUTPUT
+
  test-ami-nix:
+ needs: prepare
  strategy:
  fail-fast: false
  matrix:
+ postgres_version: ${{ fromJson(needs.prepare.outputs.postgres_versions) }}
  include:
  - runner: arm-runner
  arch: arm64
  ubuntu_release: focal
  ubuntu_version: 20.04
  mcpu: neoverse-n1
- runs-on: ${{ matrix.runner }}
+ runs-on: ${{ matrix.runner }} 
  timeout-minutes: 150
  permissions:
  contents: write
@@ -40,18 +58,29 @@ jobs:
  - name: Generate random string
  id: random
  run: echo "random_string=$(openssl rand -hex 8)" >> $GITHUB_OUTPUT
+
+ - name: Set PostgreSQL version environment variable
+ run: echo "POSTGRES_MAJOR_VERSION=${{ matrix.postgres_version }}" >> $GITHUB_ENV
+
+ - name: Generate common-nix.vars.pkr.hcl
+ run: |
+ PG_VERSION=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres'${{ matrix.postgres_version }}'"]' ansible/vars.yml)
+ PG_VERSION=$(echo $PG_VERSION | tr -d '"') # Remove any surrounding quotes
+ echo 'postgres-version = "'$PG_VERSION'"' > common-nix.vars.pkr.hcl
+ # Ensure there's a newline at the end of the file
+ echo "" >> common-nix.vars.pkr.hcl
 
  - name: Build AMI stage 1
  run: |
  packer init amazon-arm64-nix.pkr.hcl
  GIT_SHA=${{github.sha}}
- packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" amazon-arm64-nix.pkr.hcl
+ packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl
 
  - name: Build AMI stage 2
  run: |
  packer init stage2-nix-psql.pkr.hcl
  GIT_SHA=${{github.sha}}
- packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "git_sha=${GITHUB_SHA}" stage2-nix-psql.pkr.hcl 
+ packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var "postgres_major_version=${POSTGRES_MAJOR_VERSION}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "git_sha=${GITHUB_SHA}" stage2-nix-psql.pkr.hcl 
 
  - name: Run tests
  timeout-minutes: 10
@@ -65,12 +94,12 @@ jobs:
  - name: Cleanup resources on build cancellation
  if: ${{ cancelled() }}
  run: |
- aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -n 1 -I {} aws ec2 terminate-instances --region ap-southeast-1 --instance-ids {}
- 
- - name: Cleanup resources on build cancellation
+ aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --region ap-southeast-1 --instance-ids
+
+ - name: Cleanup resources after build
  if: ${{ always() }}
  run: |
- aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:testinfra-run-id,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -n 1 -I {} aws ec2 terminate-instances --region ap-southeast-1 --instance-ids {} || true
+ aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:testinfra-run-id,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -r aws ec2 terminate-instances --region ap-southeast-1 --instance-ids || true
 
  - name: Cleanup AMIs
  if: always()
@@ -91,4 +120,4 @@ jobs:
 
  # Deregister AMIs
  deregister_ami_by_name "$STAGE1_AMI_NAME"
- deregister_ami_by_name "$STAGE2_AMI_NAME"
+ deregister_ami_by_name "$STAGE2_AMI_NAME"

ansible/tasks/stage2-setup-postgres.yml

@@ -6,7 +6,7 @@
 - name: Install Postgres from nix binary cache
  become: yes
  shell: |
- sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#psql_15/bin"
+ sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#{{psql_version}}/bin"
 #TODO (samrose) switch pg_prove sourcing to develop branch once PR is merged
  when: stage2_nix
 
@@ -22,6 +22,18 @@
  sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#supabase-groonga"
  when: stage2_nix
 
+- name: Install debug symbols for postgres version
+ become: yes
+ shell: |
+ sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#{{postgresql_version}}_debug"
+ when: stage2_nix
+
+- name: Install source files for postgresql version
+ become: yes
+ shell: |
+ sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#{{postgresql_version}}_src"
+ when: stage2_nix
+
 - name: Set ownership and permissions for /etc/ssl/private
  become: yes
  file:

ansible/vars.yml

@@ -2,9 +2,17 @@ supabase_internal: true
 ebssurrogate_mode: true
 async_mode: true
 
-postgresql_major: "15"
-postgresql_release: "15.1"
-postgresql_release_checksum: sha256:ea2cf059a85882654b989acd07edc121833164a30340faee0d3615cf7058e66c
+# postgresql_major: "15"
+# postgresql_release: "15.1"
+# postgresql_release_checksum: sha256:ea2cf059a85882654b989acd07edc121833164a30340faee0d3615cf7058e66c
+postgres_major:
+ - "15"
+ - "16"
+
+# Full version strings for each major version
+postgres_release:
+ postgres15: "15.8.1.003-staging-5"
+ postgres16: "16.3.1.000-staging-5"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

docker/nix/build_nix.sh

@@ -5,6 +5,9 @@ nix --version
 if [ -d "/workspace" ]; then
  cd /workspace
 fi
+nix build .#checks.$(nix-instantiate --eval -E builtins.currentSystem | tr -d '"').psql_15 -L --no-link
+nix build .#checks.$(nix-instantiate --eval -E builtins.currentSystem | tr -d '"').psql_16 -L --no-link
 nix build .#psql_15/bin -o psql_15
-nix flake check -L 
+nix build .#psql_16/bin -o psql_16
 nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_15
+nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_16