From 0eb1a87da70d5d66ee0a2050c927b4bbeb74a478 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:26:25 +0100
Subject: [PATCH 01/17] PMM-7: Add support for custom pgsm install

---
 .../percona-distribution-postgres-setup.yml   |  1 +
 .../tasks/install-pdpgsql.yml                 | 20 ++++++++++++++++++-
 pmm_qa/pmm-framework.py                       |  4 +++-
 pmm_qa/scripts/database_options.py            |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pmm_qa/percona-distribution-postgresql/percona-distribution-postgres-setup.yml b/pmm_qa/percona-distribution-postgresql/percona-distribution-postgres-setup.yml
index e9de8de3..ae6f9321 100644
--- a/pmm_qa/percona-distribution-postgresql/percona-distribution-postgres-setup.yml
+++ b/pmm_qa/percona-distribution-postgresql/percona-distribution-postgres-setup.yml
@@ -22,6 +22,7 @@
     random_service_name_value: ""
     docker_repo: "percona/percona-distribution-postgresql"
     container_prefix: "pdpgsql_pmm{{ (setup_type|default('')) and '_' ~ setup_type }}_{{ pdpgsql_version }}_"
+    pgsm_branch: "{{ lookup('env', 'PGSM_BRANCH') }}"
 
   tasks:
     - name: Display setup type selected
diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 8f00c735..3bff780c 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -30,10 +30,28 @@
 
 - name: Install Percona Distribution for PostgreSQL
   shell: |
-    docker exec -u root {{ container_prefix }}{{ item }} apt-get install -y percona-postgresql-{{ pdpgsql_version }} percona-pgbackrest percona-pg-stat-monitor{{ pdpgsql_version }}
+    docker exec -u root {{ container_prefix }}{{ item }} apt-get install -y percona-postgresql-{{ pdpgsql_version }} percona-pgbackrest
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
 
+- name: Install PG Stat Monitor
+  shell: docker exec -u root {{ container_prefix }}{{ item }} apt-get install -y percona-pg-stat-monitor{{ pdpgsql_version }}
+  become: true
+  loop: "{{ range(1, nodes_count | int + 1) | list }}"
+  when: pgsm_branch is not defined or pgsm_branch | length == 0
+
+- name: Install PG Stat Monitor from tarball
+  shell: |
+    docker exec -u root {{ container_prefix }}{{ item }} sh -c '
+      git clone --branch ${pgsm_branch} https://github.com/percona/pg_stat_monitor.git
+      cd pg_stat_monitor
+      make USE_PGXS=1
+      make USE_PGXS=1 install
+    '
+  become: true
+  loop: "{{ range(1, nodes_count | int + 1) | list }}"
+  when: pgsm_branch is defined or pgsm_branch | length > 0
+
 - name: Start Percona distribution for Postgresql
   shell: docker exec -u root {{ container_prefix }}{{ item }} systemctl start postgresql
   become: true
diff --git a/pmm_qa/pmm-framework.py b/pmm_qa/pmm-framework.py
index a244be96..74d6253a 100755
--- a/pmm_qa/pmm-framework.py
+++ b/pmm_qa/pmm-framework.py
@@ -159,6 +159,7 @@ def setup_pdpgsql(db_type, db_version=None, db_config=None, args=None):
     # Gather Version details
     pdpgsql_version = os.getenv('PDPGSQL_VERSION') or db_version or database_configs[db_type]["versions"][-1]
     setup_type_value = get_value('SETUP_TYPE', db_type, args, db_config).lower()
+    pgsm_branch = get_value('PGSM_BRANCH', db_type, args, db_config).lower()
 
     # Define environment variables for playbook
     env_vars = {
@@ -172,7 +173,8 @@ def setup_pdpgsql(db_type, db_version=None, db_config=None, args=None):
         'PDPGSQL_PGSM_PORT': 5447,
         'DISTRIBUTION': '',
         'PMM_QA_GIT_BRANCH': os.getenv('PMM_QA_GIT_BRANCH') or 'v3',
-        'SETUP_TYPE': setup_type_value
+        'SETUP_TYPE': setup_type_value,
+        'PGSM_BRANCH': pgsm_branch
     }
 
     # Ansible playbook filename
diff --git a/pmm_qa/scripts/database_options.py b/pmm_qa/scripts/database_options.py
index ef65b555..c84436be 100644
--- a/pmm_qa/scripts/database_options.py
+++ b/pmm_qa/scripts/database_options.py
@@ -44,7 +44,7 @@
     },
     "PDPGSQL": {
         "versions": ["11", "12", "13", "14", "15", "16", "18", "17"],
-        "configurations": {"CLIENT_VERSION": "3-dev-latest", "USE_SOCKET": "", "SETUP_TYPE": ""}
+        "configurations": {"CLIENT_VERSION": "3-dev-latest", "USE_SOCKET": "", "SETUP_TYPE": "", "PGSM_BRANCH": ""}
     },
     "SSL_PDPGSQL": {
         "versions": ["11", "12", "13", "14", "15", "16", "17"],

From 45c0bda284b1cd0b59a3cfab59a7f0d7decd8dd8 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:29:18 +0100
Subject: [PATCH 02/17] PMM-7: Add support for custom pgsm install

---
 pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml b/pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml
index 8e4cc727..7ebde494 100644
--- a/pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml
+++ b/pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml
@@ -29,7 +29,7 @@
 - name: Install dependencies
   shell: |
     docker exec {{ container_prefix }}{{ item }} apt-get update
-    docker exec {{ container_prefix }}{{ item }} apt-get -y install wget gnupg2 lsb-release curl
+    docker exec {{ container_prefix }}{{ item }} apt-get -y install wget gnupg2 lsb-release curl git
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
 
 - name: Install Percona Release

From 824f998f2075cb9d8517804c479b50e9279eda17 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:30:04 +0100
Subject: [PATCH 03/17] PMM-7: Add support for custom pgsm install

---
 .../percona-distribution-postgresql/tasks/install-pdpgsql.yml   | 1 +
 pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 3bff780c..bdf0a242 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -43,6 +43,7 @@
 - name: Install PG Stat Monitor from tarball
   shell: |
     docker exec -u root {{ container_prefix }}{{ item }} sh -c '
+      apt-get -y install git
       git clone --branch ${pgsm_branch} https://github.com/percona/pg_stat_monitor.git
       cd pg_stat_monitor
       make USE_PGXS=1
diff --git a/pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml b/pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml
index 7ebde494..8e4cc727 100644
--- a/pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml
+++ b/pmm_qa/percona_server_for_mysql/tasks/prepare_install_ps.yml
@@ -29,7 +29,7 @@
 - name: Install dependencies
   shell: |
     docker exec {{ container_prefix }}{{ item }} apt-get update
-    docker exec {{ container_prefix }}{{ item }} apt-get -y install wget gnupg2 lsb-release curl git
+    docker exec {{ container_prefix }}{{ item }} apt-get -y install wget gnupg2 lsb-release curl
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
 
 - name: Install Percona Release

From 5cc7203c0d7b0c8cdb62d6070de27982c34dc634 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:35:52 +0100
Subject: [PATCH 04/17] PMM-7: Add support for custom pgsm install

---
 .../percona-distribution-postgresql/tasks/install-pdpgsql.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index bdf0a242..e981ae3d 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -44,7 +44,7 @@
   shell: |
     docker exec -u root {{ container_prefix }}{{ item }} sh -c '
       apt-get -y install git
-      git clone --branch ${pgsm_branch} https://github.com/percona/pg_stat_monitor.git
+      git clone --branch {{ pgsm_branch }} https://github.com/percona/pg_stat_monitor.git
       cd pg_stat_monitor
       make USE_PGXS=1
       make USE_PGXS=1 install

From a0d903ffd430978700b0c5e3bc8fe4a5ccdcf89a Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:40:05 +0100
Subject: [PATCH 05/17] PMM-7: Add support for custom pgsm install

---
 .../tasks/install-pdpgsql.yml                         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index e981ae3d..f1adc6a5 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -43,11 +43,12 @@
 - name: Install PG Stat Monitor from tarball
   shell: |
     docker exec -u root {{ container_prefix }}{{ item }} sh -c '
-      apt-get -y install git
-      git clone --branch {{ pgsm_branch }} https://github.com/percona/pg_stat_monitor.git
-      cd pg_stat_monitor
-      make USE_PGXS=1
-      make USE_PGXS=1 install
+      apt-get update &&
+      apt-get -y install git build-essential &&
+      git clone --branch {{ pgsm_branch }} https://github.com/percona/pg_stat_monitor.git &&
+      cd pg_stat_monitor &&
+      make USE_PGXS=1 &&
+      make USE_PGXS=1 install &&
     '
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"

From a9a0702865fd6a2391413e1a843a6becc0c9291d Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:42:07 +0100
Subject: [PATCH 06/17] PMM-7: Add support for custom pgsm install

---
 .../percona-distribution-postgresql/tasks/install-pdpgsql.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index f1adc6a5..933de2b5 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -48,7 +48,7 @@
       git clone --branch {{ pgsm_branch }} https://github.com/percona/pg_stat_monitor.git &&
       cd pg_stat_monitor &&
       make USE_PGXS=1 &&
-      make USE_PGXS=1 install &&
+      make USE_PGXS=1 install
     '
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"

From 3aa65beabaece7abf02fc3b5a0c5ef626c9cf529 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:44:59 +0100
Subject: [PATCH 07/17] PMM-7: Add support for custom pgsm install

---
 .../percona-distribution-postgresql/tasks/install-pdpgsql.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 933de2b5..deb5ec05 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -30,7 +30,7 @@
 
 - name: Install Percona Distribution for PostgreSQL
   shell: |
-    docker exec -u root {{ container_prefix }}{{ item }} apt-get install -y percona-postgresql-{{ pdpgsql_version }} percona-pgbackrest
+    docker exec -u root {{ container_prefix }}{{ item }} apt-get install -y percona-postgresql-{{ pdpgsql_version }} percona-pgbackrest postgresql-server-dev-{{ pdpgsql_version }}
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
 

From 5f1253c8c1fb10a8f39676c1164269d3b9190deb Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:49:39 +0100
Subject: [PATCH 08/17] PMM-7: Add support for custom pgsm install

---
 .../tasks/install-pdpgsql.yml                               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index deb5ec05..b4b9f760 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -30,7 +30,7 @@
 
 - name: Install Percona Distribution for PostgreSQL
   shell: |
-    docker exec -u root {{ container_prefix }}{{ item }} apt-get install -y percona-postgresql-{{ pdpgsql_version }} percona-pgbackrest postgresql-server-dev-{{ pdpgsql_version }}
+    docker exec -u root {{ container_prefix }}{{ item }} apt-get install -y percona-postgresql-{{ pdpgsql_version }} percona-pgbackrest
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
 
@@ -43,8 +43,10 @@
 - name: Install PG Stat Monitor from tarball
   shell: |
     docker exec -u root {{ container_prefix }}{{ item }} sh -c '
+      wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&
+      echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list &&
       apt-get update &&
-      apt-get -y install git build-essential &&
+      apt-get -y install git build-essential postgresql-server-dev-{{ pdpgsql_version }} &&
       git clone --branch {{ pgsm_branch }} https://github.com/percona/pg_stat_monitor.git &&
       cd pg_stat_monitor &&
       make USE_PGXS=1 &&

From a2365df1600048231786464725fd25417f340a45 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:56:23 +0100
Subject: [PATCH 09/17] PMM-7: Add support for custom pgsm install

---
 .../tasks/install-pdpgsql.yml                          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index b4b9f760..65dbd640 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -40,13 +40,21 @@
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
   when: pgsm_branch is not defined or pgsm_branch | length == 0
 
-- name: Install PG Stat Monitor from tarball
+- name: Prepare installation of PG Stat Monitor from tarball
   shell: |
     docker exec -u root {{ container_prefix }}{{ item }} sh -c '
       wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&
       echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list &&
       apt-get update &&
       apt-get -y install git build-essential postgresql-server-dev-{{ pdpgsql_version }} &&
+    '
+  become: true
+  loop: "{{ range(1, nodes_count | int + 1) | list }}"
+  when: pgsm_branch is defined or pgsm_branch | length > 0
+
+- name: Install PG Stat Monitor from tarball
+  shell: |
+    docker exec -u root {{ container_prefix }}{{ item }} sh -c '
       git clone --branch {{ pgsm_branch }} https://github.com/percona/pg_stat_monitor.git &&
       cd pg_stat_monitor &&
       make USE_PGXS=1 &&

From 2b7534ffff1a5b6616f78d1e3082d6906ddeada2 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 14:59:16 +0100
Subject: [PATCH 10/17] PMM-7: Add support for custom pgsm install

---
 .../percona-distribution-postgresql/tasks/install-pdpgsql.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 65dbd640..47dea900 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -46,7 +46,7 @@
       wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&
       echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list &&
       apt-get update &&
-      apt-get -y install git build-essential postgresql-server-dev-{{ pdpgsql_version }} &&
+      apt-get -y install git build-essential postgresql-server-dev-{{ pdpgsql_version }}
     '
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"

From 202b932229801cbce6b1d10d7c8a26db2be24dcb Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 15:02:09 +0100
Subject: [PATCH 11/17] PMM-7: Add support for custom pgsm install

---
 .../percona-distribution-postgresql/tasks/install-pdpgsql.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 47dea900..7d4885fc 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -46,7 +46,7 @@
       wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&
       echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list &&
       apt-get update &&
-      apt-get -y install git build-essential postgresql-server-dev-{{ pdpgsql_version }}
+      apt-get -y install git clang-18 llvm-18 build-essential postgresql-server-dev-{{ pdpgsql_version }}
     '
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"

From c662ef87b679656ee6d338977fdd045390af7059 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 15:11:37 +0100
Subject: [PATCH 12/17] PMM-7: Add support for custom pgsm install

---
 .../tasks/install-pdpgsql.yml                        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 7d4885fc..8100fd69 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -52,6 +52,18 @@
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
   when: pgsm_branch is defined or pgsm_branch | length > 0
 
+- name: Show pgsm_branch
+  ansible.builtin.debug:
+    msg: {{ pgsm_branch }}
+
+- name: Show pgsm_branch
+  ansible.builtin.debug:
+    msg: {{ pgsm_branch | length }}
+
+- name: Show pgsm_branch
+  ansible.builtin.debug:
+    msg: {{ pgsm_branch is defined }}
+
 - name: Install PG Stat Monitor from tarball
   shell: |
     docker exec -u root {{ container_prefix }}{{ item }} sh -c '

From a493c37c19f1382a42f7f670f460aabfc0236dd1 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 15:13:45 +0100
Subject: [PATCH 13/17] PMM-7: Add support for custom pgsm install

---
 .../tasks/install-pdpgsql.yml                               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 8100fd69..f27668e6 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -54,15 +54,15 @@
 
 - name: Show pgsm_branch
   ansible.builtin.debug:
-    msg: {{ pgsm_branch }}
+    msg: pgsm_branch
 
 - name: Show pgsm_branch
   ansible.builtin.debug:
-    msg: {{ pgsm_branch | length }}
+    msg: pgsm_branch | length
 
 - name: Show pgsm_branch
   ansible.builtin.debug:
-    msg: {{ pgsm_branch is defined }}
+    msg: pgsm_branch is defined
 
 - name: Install PG Stat Monitor from tarball
   shell: |

From 92025dc0e38c324cf2f135a1c830cbf3e458f869 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 15:16:01 +0100
Subject: [PATCH 14/17] PMM-7: Add support for custom pgsm install

---
 .../tasks/install-pdpgsql.yml                               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index f27668e6..3e853f07 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -54,15 +54,15 @@
 
 - name: Show pgsm_branch
   ansible.builtin.debug:
-    msg: pgsm_branch
+    msg: "pgsm_branch={{ pgsm_branch }}"
 
 - name: Show pgsm_branch
   ansible.builtin.debug:
-    msg: pgsm_branch | length
+    msg: "pgsm_branch={{ pgsm_branch | length }}"
 
 - name: Show pgsm_branch
   ansible.builtin.debug:
-    msg: pgsm_branch is defined
+    msg: "pgsm_branch={{ pgsm_branch is defined }}"
 
 - name: Install PG Stat Monitor from tarball
   shell: |

From 7ce84c8cce8cd3a0d1d241af772c2ec8590c273d Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Tue, 20 Jan 2026 15:18:13 +0100
Subject: [PATCH 15/17] PMM-7: Add support for custom pgsm install

---
 .../tasks/install-pdpgsql.yml                  | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 3e853f07..4e9c1f4a 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -38,7 +38,7 @@
   shell: docker exec -u root {{ container_prefix }}{{ item }} apt-get install -y percona-pg-stat-monitor{{ pdpgsql_version }}
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
-  when: pgsm_branch is not defined or pgsm_branch | length == 0
+  when: pgsm_branch | length == 0
 
 - name: Prepare installation of PG Stat Monitor from tarball
   shell: |
@@ -50,19 +50,7 @@
     '
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
-  when: pgsm_branch is defined or pgsm_branch | length > 0
-
-- name: Show pgsm_branch
-  ansible.builtin.debug:
-    msg: "pgsm_branch={{ pgsm_branch }}"
-
-- name: Show pgsm_branch
-  ansible.builtin.debug:
-    msg: "pgsm_branch={{ pgsm_branch | length }}"
-
-- name: Show pgsm_branch
-  ansible.builtin.debug:
-    msg: "pgsm_branch={{ pgsm_branch is defined }}"
+  when: pgsm_branch | length > 0
 
 - name: Install PG Stat Monitor from tarball
   shell: |
@@ -74,7 +62,7 @@
     '
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
-  when: pgsm_branch is defined or pgsm_branch | length > 0
+  when: pgsm_branch | length > 0
 
 - name: Start Percona distribution for Postgresql
   shell: docker exec -u root {{ container_prefix }}{{ item }} systemctl start postgresql

From 8ac42a952d7cb5355f53e0fe1a9b24db77263be1 Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Wed, 21 Jan 2026 08:38:21 +0100
Subject: [PATCH 16/17] PMM-7: Add support for custom pgsm install

---
 .../percona-distribution-postgresql/tasks/install-pdpgsql.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 4e9c1f4a..387b3e11 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -40,7 +40,7 @@
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
   when: pgsm_branch | length == 0
 
-- name: Prepare installation of PG Stat Monitor from tarball
+- name: Prepare installation of PG Stat Monitor from sources
   shell: |
     docker exec -u root {{ container_prefix }}{{ item }} sh -c '
       wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&
@@ -52,7 +52,7 @@
   loop: "{{ range(1, nodes_count | int + 1) | list }}"
   when: pgsm_branch | length > 0
 
-- name: Install PG Stat Monitor from tarball
+- name: Install PG Stat Monitor from sources
   shell: |
     docker exec -u root {{ container_prefix }}{{ item }} sh -c '
       git clone --branch {{ pgsm_branch }} https://github.com/percona/pg_stat_monitor.git &&

From 57b78c4a13a076af6ff4e012168f5846b40c43bd Mon Sep 17 00:00:00 2001
From: Peter Sirotnak <sirotnak.p@gmail.com>
Date: Thu, 22 Jan 2026 09:18:37 +0100
Subject: [PATCH 17/17] PMM-7: Add support for custom pgsm install

---
 .../percona-distribution-postgresql/tasks/install-pdpgsql.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
index 387b3e11..067cf297 100644
--- a/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
+++ b/pmm_qa/percona-distribution-postgresql/tasks/install-pdpgsql.yml
@@ -46,7 +46,7 @@
       wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&
       echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list &&
       apt-get update &&
-      apt-get -y install git clang-18 llvm-18 build-essential postgresql-server-dev-{{ pdpgsql_version }}
+      apt-get -y install git clang-18 llvm-18 build-essential percona-postgresql-server-dev-{{ pdpgsql_version }}
     '
   become: true
   loop: "{{ range(1, nodes_count | int + 1) | list }}"