From 22ad698133eb92ed0cc2407ad579acc1e0f04d1f Mon Sep 17 00:00:00 2001
From: Puneet Kala <puneet.0191@gmail.com>
Date: Tue, 6 Sep 2022 18:14:59 +0530
Subject: [PATCH] PMM-7 Verification with REL 1_1 Branch (#301)

* PMM-7 Verification with REL 1_1 Branch

* PMM-7 Add more timeout

* PMM-7 Changes for v11

* PMM-7 Changes for v12

* PMM-7 Changes for V13

* PMM-7 Increase timeout
---
 .github/workflows/postgresql-11-pmm.yaml | 4 ++--
 .github/workflows/postgresql-12-pmm.yaml | 4 ++--
 .github/workflows/postgresql-13-pmm.yaml | 4 ++--
 .github/workflows/postgresql-14-pmm.yaml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/postgresql-11-pmm.yaml b/.github/workflows/postgresql-11-pmm.yaml
index c845b324..05005199 100644
--- a/.github/workflows/postgresql-11-pmm.yaml
+++ b/.github/workflows/postgresql-11-pmm.yaml
@@ -5,7 +5,7 @@ jobs:
   build:
     name: pg-11-pgsm-pmm-integration-test
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - name: Clone QA Integration repository
         uses: actions/checkout@v2
@@ -18,7 +18,7 @@ jobs:
         run: echo 'The branch and Repo Name is' ${{ github.head_ref }} ${{ github.actor }}/pg_stat_monitor
       
       - name: Run PMM & PGSM Setup, E2E Tests
-        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=11
+        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=11 --pgstat-monitor-branch=REL_1_1_0
 
       - 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 d80541a4..f9a1db94 100644
--- a/.github/workflows/postgresql-12-pmm.yaml
+++ b/.github/workflows/postgresql-12-pmm.yaml
@@ -5,7 +5,7 @@ jobs:
   build:
     name: pg-12-pgsm-pmm-integration-test
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - name: Clone QA Integration repository
         uses: actions/checkout@v2
@@ -18,7 +18,7 @@ jobs:
         run: echo 'The branch and Repo Name is' ${{ github.head_ref }} ${{ github.actor }}/pg_stat_monitor
       
       - name: Run PMM & PGSM Setup, E2E Tests
-        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=12
+        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=12 --pgstat-monitor-branch=REL_1_1_0
 
       - 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 58792509..7dbb9bbd 100644
--- a/.github/workflows/postgresql-13-pmm.yaml
+++ b/.github/workflows/postgresql-13-pmm.yaml
@@ -5,7 +5,7 @@ jobs:
   build:
     name: pg-13-pgsm-pmm-integration-test
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - name: Clone QA Integration repository
         uses: actions/checkout@v2
@@ -18,7 +18,7 @@ jobs:
         run: echo 'The branch and Repo Name is' ${{ github.head_ref }} ${{ github.actor }}/pg_stat_monitor
 
       - name: Run PMM & PGSM Setup, E2E Tests
-        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=13
+        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=13 --pgstat-monitor-branch=REL_1_1_0
 
       - 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 6c97c72d..bdc9deb3 100644
--- a/.github/workflows/postgresql-14-pmm.yaml
+++ b/.github/workflows/postgresql-14-pmm.yaml
@@ -5,7 +5,7 @@ jobs:
   build:
     name: pg-14-pgsm-pmm-integration-test
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - name: Clone QA Integration repository
         uses: actions/checkout@v2
@@ -18,7 +18,7 @@ jobs:
         run: echo 'The branch and Repo Name is' ${{ github.head_ref }} ${{ github.actor }}/pg_stat_monitor
 
       - name: Run PMM & PGSM Setup, E2E Tests
-        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=14
+        run: bash -xe ./pmm_pgsm_setup/pmm_pgsm_setup.sh --pgsql-version=14 --pgstat-monitor-branch=REL_1_1_0
 
       - name: Get PMM-Agent Logs from the Container
         if: success() || failure()    # run this step even if previous step failed