Sam/oriole16

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

@@ -3,8 +3,9 @@ name: Release AMI Nix
 on:
   push:
     branches:
-      - develop
-      - release/*
+      #- develop
+      #- release/*
+      - sam/oriole16
     paths:
       - '.github/workflows/ami-release-nix.yml'
       - 'common-nix.vars.pkr.hcl'

.github/workflows/test.yml

@@ -4,7 +4,8 @@ on:
   push:
     branches:
       - develop
-  pull_request:
+  #TODO PR uncomment this line
+  #pull_request:
   workflow_dispatch:
 
 jobs:

ansible/tasks/stage2-setup-postgres.yml

@@ -3,11 +3,33 @@
 #   shell: |
 #     sudo -u postgres bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install nixpkgs#openjdk11"
 # It was decided to leave pljava disabled at https://github.com/supabase/postgres/pull/690 therefore removing this task
+
+- name: Check psql_version and modify supautils.conf and postgresql.conf if necessary
+  block:
+    - name: Check if psql_version is psql_orioledb-16
+      set_fact:
+        is_psql_oriole_16: "{{ psql_version == 'psql_orioledb-16' }}"
+
+    - name: Remove specified extensions from postgresql.conf if oriole-16 build
+      ansible.builtin.command:
+        cmd: >
+          sed -i 's/ timescaledb,//g' 
+          /etc/postgresql/postgresql.conf
+      when: is_psql_oriole_16 and stage2_nix
+      become: yes
+
+    - name: Remove specified extensions from supautils.conf if oriole-16 build
+      ansible.builtin.command:
+        cmd: >
+          sed -i 's/ timescaledb,//g; s/ vector,//g; s/ plv8,//g; s/ postgis,//g; s/ pgrouting,//g' 
+          /etc/postgresql-custom/supautils.conf
+      when: is_psql_oriole_16 and stage2_nix
+      become: yes
+
 - 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_version}}/bin"
-#TODO (samrose) switch pg_prove sourcing to develop branch once PR is merged
   when: stage2_nix
 
 - name: Install pg_prove from nix binary cache
@@ -198,13 +220,19 @@
     recurse: yes
   when: stage2_nix
 
-- name: Recursively create symbolic links and set permissions for the contrib/postgis-* dir
-  shell: >
-    sudo mkdir -p /usr/lib/postgresql/share/postgresql/contrib && \
-    sudo find /var/lib/postgresql/.nix-profile/share/postgresql/contrib/ -mindepth 1 -type d -exec sh -c 'for dir do sudo ln -s "$dir" "/usr/lib/postgresql/share/postgresql/contrib/$(basename "$dir")"; done' sh {} + \
-    && chown -R postgres:postgres "/usr/lib/postgresql/share/postgresql/contrib/"
-  become: yes
-  when: stage2_nix
+- name: Check psql_version and run postgis linking if not oriole-16
+  block:
+    - name: Check if psql_version is psql_orioledb-16
+      set_fact:
+        is_psql_oriole_16: "{{ psql_version == 'psql_orioledb-16' }}"
+
+    - name: Recursively create symbolic links and set permissions for the contrib/postgis-* dir
+      shell: >
+        sudo mkdir -p /usr/lib/postgresql/share/postgresql/contrib && \
+        sudo find /var/lib/postgresql/.nix-profile/share/postgresql/contrib/ -mindepth 1 -type d -exec sh -c 'for dir do sudo ln -s "$dir" "/usr/lib/postgresql/share/postgresql/contrib/$(basename "$dir")"; done' sh {} + \
+        && chown -R postgres:postgres "/usr/lib/postgresql/share/postgresql/contrib/"
+      become: yes
+      when: stage2_nix and not is_psql_oriole_16
 
 - name: Create symbolic links from /var/lib/postgresql/.nix-profile/share/postgresql/timezonesets to /usr/lib/postgresql/share/postgresql/timeszonesets
   file:
@@ -239,8 +267,17 @@
     line: pgsodium.getkey_script= '{{ pg_bindir }}/pgsodium_getkey.sh'
   when: stage2_nix
 
+#TODO PR may need to remove this.
+- name: Create symbolic link for pgsodium_getkey script
+  file:
+    src: "/usr/lib/postgresql/bin/pgsodium_getkey.sh"
+    dest: "/usr/lib/postgresql/share/postgresql/extension/pgsodium_getkey"
+    state: link
+  become: yes
+  when: stage2_nix
+
 - name: Append GRN_PLUGINS_DIR to /etc/environment.d/postgresql.env
   ansible.builtin.lineinfile:
     path: /etc/environment.d/postgresql.env
     line: 'GRN_PLUGINS_DIR=/var/lib/postgresql/.nix-profile/lib/groonga/plugins'
-  become: yes
+  become: yes

ansible/tasks/test-image.yml

@@ -4,11 +4,22 @@
       - libtap-parser-sourcehandler-pgtap-perl
   when: debpkg_mode
 
+# - name: Temporarily disable PG Sodium references in config
+#   become: yes
+#   become_user: postgres
+#   shell:
+#     cmd: sed -i.bak -e "s/pg_net,\ pgsodium,\ timescaledb/pg_net,\ timescaledb/g" -e "s/pgsodium.getkey_script=/#pgsodium.getkey_script=/g" /etc/postgresql/postgresql.conf
+#   when: debpkg_mode or stage2_nix
+
 - name: Temporarily disable PG Sodium references in config
   become: yes
   become_user: postgres
   shell:
-    cmd: sed -i.bak -e "s/pg_net,\ pgsodium,\ timescaledb/pg_net,\ timescaledb/g" -e "s/pgsodium.getkey_script=/#pgsodium.getkey_script=/g" /etc/postgresql/postgresql.conf
+    cmd: >
+      sed -i.bak
+      -e 's/\(shared_preload_libraries = '\''.*\)pgsodium,\(.*'\''\)/\1\2/'
+      -e 's/pgsodium.getkey_script=/#pgsodium.getkey_script=/'
+      /etc/postgresql/postgresql.conf
   when: debpkg_mode or stage2_nix
 
 - name: Start Postgres Database to load all extensions.
@@ -52,6 +63,40 @@
   failed_when: retval.rc != 0
   when: debpkg_mode or stage2_nix
 
+- name: Check psql_version and modify migrations if orioe-16
+  block:
+    - name: Check if psql_version is psql_orioledb-16
+      set_fact:
+        is_psql_oriole_16: "{{ psql_version == 'psql_orioledb-16' }}"
+
+    - name: Remove specified extensions from SQL file
+      ansible.builtin.command:
+        cmd: >
+          sed -i '/\\ir.*\(timescaledb\|postgis\|pgrouting\|plv8\|pgvector\).*\.sql/d' /tmp/migrations/tests/extensions/test.sql
+      when: is_psql_oriole_16
+      become: yes
+
+    - name: Remove specified extension files from extensions directory
+      ansible.builtin.find:
+        paths: /tmp/migrations/tests/extensions
+        patterns: 
+          - '*timescaledb*.sql'
+          - '*postgis*.sql'
+          - '*pgrouting*.sql'
+          - '*plv8*.sql'
+          - '*pgvector*.sql'
+      register: files_to_remove
+      when: is_psql_oriole_16
+
+    - name: Delete matched extension files
+      ansible.builtin.file:
+        path: "{{ item.path }}"
+        state: absent
+      loop: "{{ files_to_remove.files }}"
+      when: is_psql_oriole_16
+      become: yes
+
+
 - name: Run migrations tests
   shell: /usr/bin/pg_prove -U supabase_admin -h localhost -d postgres -v tests/test.sql
   register: retval

ansible/vars.yml

@@ -2,17 +2,17 @@ supabase_internal: true
 ebssurrogate_mode: true
 async_mode: true
 
-# postgresql_major: "15"
-# postgresql_release: "15.1"
-# postgresql_release_checksum: sha256:ea2cf059a85882654b989acd07edc121833164a30340faee0d3615cf7058e66c
 postgres_major:
-  - "15"
-  - "16"
+  #- "15"
+  #- "16"
+  - "orioledb-16"
 
 # Full version strings for each major version
+# TOD PR uncomment these lines
 postgres_release:
-  postgres15: "15.8.1.004"
-  postgres16: "16.3.1.010"
+  #postgres15: "15.8.1.003-staging-5"
+  #postgres16: "16.3.1.000-staging-5"
+  postgresorioledb-16: "orioledb-16.3.1.000-staging-12"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

docker/nix/build_nix.sh

@@ -7,7 +7,10 @@ if [ -d "/workspace" ]; then
 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
+#no nix flake check on oriole yet
 nix build .#psql_15/bin -o psql_15
 nix build .#psql_16/bin -o psql_16
+nix build .#psql_orioledb-16/bin -o psql_orioledb_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
+nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./psql_orioledb_16