PMM-14558 merge v3 into main

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 # Order is important; the last matching pattern takes the most precedence.
 
-*	@yurkovychv @puneet0191 @olexandr-havryliak @sandraromanchenko
+*	@yurkovychv @puneet0191 @olexandr-havryliak @sandraromanchenko @peterSirotnak

.github/workflows/PMM_PDPGSQL.yaml

@@ -3,86 +3,89 @@ on:
   workflow_dispatch:
     inputs:
       pdpgsql_version:
-        description: "PDPGSQL Docker hub example perconalab/percona-distribution-postgresql:16.0 latest available Image"
+        description: "PDPGSQL Version available Image versions on github, example: 15, 16, 17"
         required: true
-      pmm_image:
-        description: "pmm_image, example: perconalab/pmm-server:dev-latest"
+        default: '17'
+        type: string
+      pmm_qa_branch:
+        description: "Branch for qa-integration to checkout"
         required: false
-      repo:
-        description: "Percona Release Repo defaults to Experiemental example: experimental"
+        type: string
+      pmm_ui_tests_branch:
+        description: "Branch for PMM-UI tests to checkout"
         required: false
+        type: string
+      pmm_server_image:
+        description: "pmm_image, example: perconalab/pmm-server:3-dev-latest"
+        default: 'perconalab/pmm-server:3-dev-latest'
+        required: false
+        type: string
+      pmm_client_version:
+        description: 'PMM Client version (3-dev-latest|pmm3-rc|x.xx.x|https...)'
+        default: '3-dev-latest'
+        required: false
+        type: string
   push:
     branches:
-      - main
+      - v3
 
   pull_request:
     branches:
-      - main
+      - v3
 
 jobs:
   PMM_PDPGSQL_TEST:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
+    runs-on: ubuntu-22.04
+    timeout-minutes: 40
     env:
-      PDPGSQL_VERSION: ${{ github.event.inputs.pdpgsql_version || 'perconalab/percona-distribution-postgresql:16.0' }}
-      PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }}
-      REPO: ${{ github.event.inputs.repo || 'experimental' }}
-
+      ADMIN_PASSWORD: 'admin'
+      PDPGSQL_VERSION: ${{ github.event.inputs.pdpgsql_version || '17' }}
+      PMM_IMAGE: ${{ github.event.inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
+      PMM_QA_BRANCH: ${{ github.event.inputs.pmm_qa_branch || 'v3' }}
+      PMM_UI_BRANCH: ${{ github.event.inputs.pmm_ui_tests_branch || 'v3' }}
+      PMM_CLIENT_VERSION: ${{ github.event.inputs.pmm_client_version || '3-dev-latest' }}
+
     steps:
     - uses: actions/checkout@v2
 
-    - name: Concatenate values to environment file
-      run: |
-        echo "PMM_QA_REPO_URL=https://github.com/percona/pmm-qa/" >> $GITHUB_ENV
-        echo "PMM_QA_REPO_BRANCH=main" >> $GITHUB_ENV
-
-    - name: Install Ansible and update the node
-      run: sudo apt-get update -y && sudo apt-get install ansible -y
-
-    - name: Install Percona Release Package
-      run: wget https://repo.percona.com/apt/percona-release_latest.generic_all.deb && sudo dpkg -i percona-release_latest.generic_all.deb
-
-    - name: Install Enable percona-release experimental for dev-latest installation of pmm2-client
-      if: ${{ inputs.repo == 'experimental' }}
-      run: sudo percona-release enable-only original experimental
+    - name: Run the PMM Server container
+      run: docker run --detach --restart always -p 443:8443 -p 8081:8080 --name pmm-server ${{ env.PMM_IMAGE }}
 
-    - name: Install Enable percona-release testing for rc installation of pmm2-client
-      if: ${{ inputs.repo == 'testing' }}
-      run: sudo percona-release enable-only original testing
-
-    - name: Install PMM Client 
-      run: sudo apt update -y && sudo apt-get upgrade -y && sudo apt-get install -y pmm2-client
+    - name: Checkout qa-integration repo
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ env.PMM_QA_BRANCH }}
+        repository: Percona-Lab/qa-integration
+        path: ./qa-integration
 
-    - name: Delete if the Repo already checked out
-      run: sudo rm -r pmm-qa || true 
+    - name: Export path to qa-integration repo
+      working-directory: qa-integration
+      run: echo "PATH_TO_PMM_QA=$(pwd)" >> $GITHUB_ENV
 
-    - name: Clone the PMM_QA repo 
-      run: git clone -b ${{ env.PMM_QA_REPO_BRANCH }} ${{ env.PMM_QA_REPO_URL }}
-
-    - name: Give write perimssion to the bash script
-      run: chmod +x ./pmm-tests/pmm-framework.sh
-      working-directory: pmm-qa
-
-    - name: Run the pmm container in backgrounds
-      run: docker run --detach --restart always -p 443:443 -p 80:80 --name pmm-server ${{ env.PMM_IMAGE }}
-
-    - name: Wait before pmm-admin config command
-      run: sleep 120
-
-    - name: setup pmm-admin config
-      run:  sudo pmm-admin config --server-insecure-tls --server-url=https://admin:admin@localhost:443
+    - name: Run Setup for E2E Tests
+      working-directory: qa-integration/pmm_qa
+      run: |
+        mkdir -m 777 -p /tmp/backup_data
+        python3 -m venv virtenv
+        . virtenv/bin/activate
+        pip install --upgrade pip
+        pip install --force-reinstall -U setuptools
+        pip install -r requirements.txt
+        python pmm-framework.py --verbose --pmm-server-password=${{ env.ADMIN_PASSWORD }} --client-version=${{ env.PMM_CLIENT_VERSION }} --database PDPGSQL=${{ env.PDPGSQL_VERSION }}
 
-    - name: Run for PDPGSQL tests
-      run: sudo ./pmm-framework.sh --pdpgsql-version=16 --pmm2 --download --addclient=pdpgsql,1
-      working-directory: pmm-qa/pmm-tests
-
-    - name: Checkout the repo and install node packages
-      run: git clone https://github.com/percona/pmm-ui-tests.git && cd pmm-ui-tests && npm ci
+    - name: Checkout PMM UI tests
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ env.PMM_UI_BRANCH }}
+        repository: percona/pmm-ui-tests
+        path: ./pmm-ui-tests
 
     - name: Install npx dependencies
-      run: sudo npx playwright install-deps && npx codeceptjs def pr.codecept.js
+      run: npm ci && npx playwright install --with-deps && npx codeceptjs def pr.codecept.js
       working-directory: pmm-ui-tests
 
     - name: Run the Integration tests of pdpgsql
-      run: npx codeceptjs run -c pr.codecept.js tests/qa-integration/pmm_pdpgsql_integration_test.js --steps --debug
       working-directory: pmm-ui-tests
+      run: |
+        export PMM_UI_URL="http://127.0.0.1:8081/"
+        npx codeceptjs run -c pr.codecept.js tests/qa-integration/pmm_pdpgsql_integration_test.js

.github/workflows/PMM_PROXYSQL.yaml

@@ -1,37 +1,61 @@
-name: PMM_PXC_PROXYSQL
+name: PMM_PROXYSQL
 on:
   workflow_dispatch:
     inputs:
       pxc_version:
-        description: "pxc version, example: 8.0.33-25 Fetched from https://github.com/Percona-QA/package-testing/blob/master/VERSIONS by default"
-        required: false
+        description: "pxc version, example: 8.0.33-25 Fetched from https://github.com/Percona-QA/package-testing/blob/master/VERSIONS"
+        default: 'https://github.com/Percona-QA/package-testing/blob/master/VERSIONS'
+        required: true
+        type: string
       pxc_glibc:
         description: "pxc glibc version, example: 2.35"
+        default: '2.35'
         required: true
-      pmm_image:
-        description: "pmm_image, example: perconalab/pmm-server:dev-latest"
+      pmm_qa_branch:
+        description: "Branch for qa-integration to checkout"
+        required: false
+        type: string
+      pmm_ui_tests_branch:
+        description: "Branch for PMM-UI tests to checkout"
+        required: false
+        type: string
+      pmm_server_image:
+        description: "pmm_image, example: perconalab/pmm-server:3-dev-latest"
+        default: 'perconalab/pmm-server:3-dev-latest'
         required: false
+        type: string
+      pmm_client_version:
+        description: 'PMM Client version (3-dev-latest|pmm3-rc|x.xx.x|https...)'
+        default: '3-dev-latest'
+        required: false
+        type: string
   push:
     branches:
-      - main
+      - v3
 
   pull_request:
     branches:
-      - main
+      - v3
 
 jobs:
   PMM_PXC_TEST:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
+    runs-on: ubuntu-22.04
+    timeout-minutes: 40
     env:
+      ADMIN_PASSWORD: 'admin'
+      PXC_VERSION: ${{ github.event.inputs.pxc_version || '8.0' }}
       PXC_GLIBC: ${{ github.event.inputs.pxc_glibc || '2.35' }}
-      PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }}
+      PMM_SERVER_IMAGE: ${{ github.event.inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
+      PMM_QA_BRANCH: ${{ github.event.inputs.pmm_qa_branch || 'v3' }}
+      PMM_UI_BRANCH: ${{ github.event.inputs.pmm_ui_tests_branch || 'v3' }}
+      PMM_CLIENT_VERSION: ${{ github.event.inputs.pmm_client_version || '3-dev-latest' }}
+
     steps:
     - uses: actions/checkout@v2
 
     - name: PXC_VERSION ENV Setup
       run: |
-        if [[ -n "${{ github.event.inputs.pxc_version }}" ]]; then
+        if [[ "${{ github.event.inputs.pxc_version }}" != http* ]]; then
           PXC_VERSION="${{ github.event.inputs.pxc_version }}"
           PXC_VERSION_PATH=$(echo "pxc-$PXC_VERSION")
           PXC_VERSION_TRIMED=$(echo ${PXC_VERSION%-*})
@@ -50,50 +74,53 @@ jobs:
       run: |
         echo "PXC_TARBALL_PATH=https://downloads.percona.com/downloads/TESTING/${{env.PXC_VERSION_PATH}}/Percona-XtraDB-Cluster_${{env.PXC_VERSION_TAR}}_Linux.x86_64.glibc${{env.PXC_GLIBC}}.tar.gz" >> $GITHUB_ENV
         echo "PMM_QA_REPO_URL=https://github.com/percona/pmm-qa/" >> $GITHUB_ENV
-        echo "PMM_QA_REPO_BRANCH=main" >> $GITHUB_ENV
 
     - name: Install Ansible and update the node
       run: sudo apt-get update -y && sudo apt-get install ansible -y
 
-    - name: Install Percona Release Package
-      run: wget https://repo.percona.com/apt/percona-release_latest.generic_all.deb && sudo dpkg -i percona-release_latest.generic_all.deb
-
-    - name: Install Enable percona-release experimental for dev-latest installation of pmm2-client
-      run: sudo percona-release enable-only original experimental
-
-    - name: Install PMM Client 
-      run: sudo apt update -y && sudo apt-get upgrade -y && sudo apt-get install -y pmm2-client
-
-    - name: Delete if the Repo already checked out
-      run: sudo rm -r pmm-qa || true 
+    - name: Run the PMM Server container
+      run: docker run --detach --restart always -p 443:8443 -p 8081:8080 --name pmm-server ${{ env.PMM_SERVER_IMAGE }}
 
-    - name: Clone the PMM_QA repo 
-      run: git clone -b ${{ env.PMM_QA_REPO_BRANCH }} ${{ env.PMM_QA_REPO_URL }}
-
-    - name: Give write perimssion to the bash script
-      run: chmod +x ./pmm-tests/pmm-framework.sh
-      working-directory: pmm-qa
+    - name: Checkout qa-integration repo
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ env.PMM_QA_BRANCH }}
+        repository: Percona-Lab/qa-integration
+        path: ./qa-integration
 
-    - name: Run the pmm container in backgrounds
-      run: docker run --detach --restart always -p 443:443 -p 80:80 --name pmm-server ${{ env.PMM_IMAGE }}
+    - name: Export path to qa-integration repo
+      working-directory: qa-integration
+      run: echo "PATH_TO_PMM_QA=$(pwd)" >> $GITHUB_ENV
 
-    - name: Wait before pmm-admin config command
-      run: sleep 120
-
-    - name: setup pmm-admin config
-      run:  sudo pmm-admin config --server-insecure-tls --server-url=https://admin:admin@localhost:443
+    - name: Run Setup for E2E Tests
+      working-directory: qa-integration/pmm_qa
+      run: |
+        mkdir -m 777 -p /tmp/backup_data
+        python3 -m venv virtenv
+        . virtenv/bin/activate
+        pip install --upgrade pip
+        pip install --force-reinstall -U setuptools
+        pip install -r requirements.txt
+        if [[ "${{ github.event.inputs.pxc_version }}" != http* ]]; then
+          python pmm-framework.py --verbose --pmm-server-password=${{ env.ADMIN_PASSWORD }} --client-version=${{ env.PMM_CLIENT_VERSION }} --database PXC=${{ env.PXC_VERSION }}
+        else
+          python pmm-framework.py --verbose --pmm-server-password=${{ env.ADMIN_PASSWORD }} --client-version=${{ env.PMM_CLIENT_VERSION }} --database PXC,TARBALL=${{ env.PXC_TARBALL_PATH }}
+        fi
 
-    - name: Run for PXC tests
-      run: ./pmm-framework.sh --with-proxysql --pxc-version ${{ env.PXC_VERSION }} --addclient=pxc,1 --pmm2 --pxc-tarball ${{ env.PXC_TARBALL_PATH }}
-      working-directory: pmm-qa/pmm-tests
-
-    - name: Checkout the repo and install node packages
-      run: git clone https://github.com/percona/pmm-ui-tests.git && cd pmm-ui-tests && npm ci
+    - name: Checkout PMM UI tests
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ env.PMM_UI_BRANCH }}
+        repository: percona/pmm-ui-tests
+        path: ./pmm-ui-tests
 
     - name: Install npx dependencies
-      run: cd pmm-ui-tests && sudo npx playwright install-deps && npx codeceptjs def pr.codecept.js
-
+      run: npm ci && npx playwright install --with-deps && npx codeceptjs def pr.codecept.js
+      working-directory: pmm-ui-tests
+
     - name: Run the Integration tests of PXC
-      run: npx codeceptjs run -c pr.codecept.js tests/qa-integration/pmm_pxc_integration_test.js --steps --debug
+      run: |
+        export PMM_UI_URL="http://127.0.0.1:8081/" 
+        npx codeceptjs run -c pr.codecept.js tests/qa-integration/pmm_pxc_integration_test.js
       working-directory: pmm-ui-tests