From ce12d56b1729404ce72cac747657f5566d4406a8 Mon Sep 17 00:00:00 2001 From: Puneet Kala Date: Thu, 27 Oct 2022 11:55:56 +0530 Subject: [PATCH] PMM-7 Adding updates on integration pipelines (#308) * PMM-7 Fix the github action * PMM-7 fix version 12 * PMM-7 Fix Typo * PMM-7 Fix Typo * PMM-7 Increase timeout * PMM-7 Increase timeout * PMM-7 Add support for pgsql13 * PMM-7 Adding support for PG 14 * PMM-7 Increase timer * PMM-7 Adding integration with PG15 * PMM-7 Handle PG 11 changes * PMM-7 handle PG 12 changes * PMM-7 Temp commit for regression * PMM-7 Adding commit * PMM-7 UI tests branch * PMM-7 Revert temp branch * PMM-7 Revert temp branch * PMM-7 revert temp branch * PMM-7 Revert the changes --- .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 +-- .github/workflows/postgresql-15-pmm.yaml | 33 ++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/postgresql-15-pmm.yaml diff --git a/.github/workflows/postgresql-11-pmm.yaml b/.github/workflows/postgresql-11-pmm.yaml index c845b324..d33e5c1b 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_1 - 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..60cb6e4e 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_1 - 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..93c5cd06 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_1 - 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..20d0d110 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_1 - 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 new file mode 100644 index 00000000..073fa1b0 --- /dev/null +++ b/.github/workflows/postgresql-15-pmm.yaml @@ -0,0 +1,33 @@ +name: postgresql-15-pmm-integration +on: push + +jobs: + build: + name: pg-15-pgsm-pmm-integration-test + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Clone QA Integration repository + uses: actions/checkout@v2 + with: + repository: 'Percona-Lab/qa-integration' + ref: 'main' + + # print branch and Repo name + - name: Get branch and Repo Name + 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=15 --pgstat-monitor-branch=REL_1_1_1 + + - name: Get PMM-Agent Logs from the Container + if: success() || failure() # run this step even if previous step failed + run: docker exec pgsql_pgsm_15 cat pmm-agent.log > ./pmm-ui-tests/tests/output/pmm-agent.log + + - name: Upload Tests Artifacts + uses: actions/upload-artifact@v3 + if: success() || failure() # run this step even if previous step failed + with: + name: tests-artifact + path: ./pmm-ui-tests/tests/output/ + if-no-files-found: ignore # 'warn' or 'ignore' are also available, defaults to `warn`