From d04fe530f410fc636fbcc2870ed3273be4998b5a Mon Sep 17 00:00:00 2001
From: yurkovychv <vasyl.yurkovych@percona.com>
Date: Mon, 20 Mar 2023 17:54:49 +0200
Subject: [PATCH] PMM-7 update setup for PMM integration

---
 .github/workflows/postgresql-11-pmm.yaml | 4 ++--
 .github/workflows/postgresql-12-pmm.yaml | 4 ++--
 .github/workflows/postgresql-13-pmm.yaml | 2 +-
 .github/workflows/postgresql-14-pmm.yaml | 2 +-
 .github/workflows/postgresql-15-pmm.yaml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/postgresql-11-pmm.yaml b/.github/workflows/postgresql-11-pmm.yaml
index 95013ae..c989c16 100644
--- a/.github/workflows/postgresql-11-pmm.yaml
+++ b/.github/workflows/postgresql-11-pmm.yaml
@@ -24,9 +24,9 @@ jobs:
       - name: "Set TARGET_BRANCH variable for a PUSH run"
         if: github.event_name == 'push'
         run: echo "TARGET_BRANCH=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      
+
       - name: Run PMM & PGSM Setup, E2E Tests
-        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=11 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
+        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-pgsm-container=pgsql_pgsm_11 --pgsql-version=11 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
 
       - name: Get PMM-Agent Logs from the Container
         if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/postgresql-12-pmm.yaml b/.github/workflows/postgresql-12-pmm.yaml
index e5b88d6..b8ced9a 100644
--- a/.github/workflows/postgresql-12-pmm.yaml
+++ b/.github/workflows/postgresql-12-pmm.yaml
@@ -24,9 +24,9 @@ jobs:
       - name: "Set TARGET_BRANCH variable for a PUSH run"
         if: github.event_name == 'push'
         run: echo "TARGET_BRANCH=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      
+
       - name: Run PMM & PGSM Setup, E2E Tests
-        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=12 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
+        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-pgsm-container=pgsql_pgsm_12 --pgsql-version=12 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
 
       - name: Get PMM-Agent Logs from the Container
         if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/postgresql-13-pmm.yaml b/.github/workflows/postgresql-13-pmm.yaml
index 549c5a4..214b857 100644
--- a/.github/workflows/postgresql-13-pmm.yaml
+++ b/.github/workflows/postgresql-13-pmm.yaml
@@ -26,7 +26,7 @@ jobs:
         run: echo "TARGET_BRANCH=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Run PMM & PGSM Setup, E2E Tests
-        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=13 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
+        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-pgsm-container=pgsql_pgsm_13 --pgsql-version=13 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
 
       - name: Get PMM-Agent Logs from the Container
         if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/postgresql-14-pmm.yaml b/.github/workflows/postgresql-14-pmm.yaml
index 3c34e63..2016241 100644
--- a/.github/workflows/postgresql-14-pmm.yaml
+++ b/.github/workflows/postgresql-14-pmm.yaml
@@ -26,7 +26,7 @@ jobs:
         run: echo "TARGET_BRANCH=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Run PMM & PGSM Setup, E2E Tests
-        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=14 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
+        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-pgsm-container=pgsql_pgsm_14 --pgsql-version=14 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
 
       - name: Get PMM-Agent Logs from the Container
         if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/postgresql-15-pmm.yaml b/.github/workflows/postgresql-15-pmm.yaml
index c621aaa..de56ab2 100644
--- a/.github/workflows/postgresql-15-pmm.yaml
+++ b/.github/workflows/postgresql-15-pmm.yaml
@@ -26,7 +26,7 @@ jobs:
         run: echo "TARGET_BRANCH=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Run PMM & PGSM Setup, E2E Tests
-        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=15 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
+        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-pgsm-container=pgsql_pgsm_15 --pgsql-version=15 --pgstat-monitor-branch=${{ env.TARGET_BRANCH }}
 
       - name: Get PMM-Agent Logs from the Container
         if: success() || failure()    # run this step even if previous step failed