From 27bfe831910fadd32f8dc27df3412a24be284fb4 Mon Sep 17 00:00:00 2001 From: yurkovychv Date: Wed, 10 Jul 2024 20:21:37 +0300 Subject: [PATCH 1/5] PMM-13228 update codeceptjs runner --- .../workflows/runner-e2e-tests-codeceptjs.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/runner-e2e-tests-codeceptjs.yml b/.github/workflows/runner-e2e-tests-codeceptjs.yml index 457bee02..c6ef9bad 100644 --- a/.github/workflows/runner-e2e-tests-codeceptjs.yml +++ b/.github/workflows/runner-e2e-tests-codeceptjs.yml @@ -144,6 +144,23 @@ jobs: working-directory: ./pmm-qa run: sudo bash -x pmm-tests/pmm2-client-setup.sh --pmm_server_ip 192.168.0.1 --client_version ${{ env.PMM_CLIENT_VERSION }} --admin_password ${{ env.ADMIN_PASSWORD }} --use_metrics_mode no + - name: Compare FullCommit for pmm-server and pmm-client + if: contains(inputs.pmm_server_image, 'dev-latest') && contains(inputs.pmm_client_version, 'dev-latest') + shell: bash + run: | + local_version=$(pmm-admin version --json) + local_full_commit=$(echo $local_version | jq -r '.fullCommit') + + container_version=$(docker exec pmm-server pmm-admin version --json) + container_full_commit=$(echo $container_version | jq -r '.fullCommit') + + if [[ "$local_full_commit" != "$container_full_commit" ]]; then + echo "Commits for pmm-server and pmm-client are different! Check the versions!" + echo "container pmm-admin version output is : $container_version" + echo "local pmm-admin version output is : $local_version" + exit 1 + fi + - name: Run Setup for E2E Tests working-directory: ./pmm-qa run: sudo -E bash -x pmm-tests/pmm-framework.sh ${{ env.WIZARD_ARGS }} --pmm2 From 2d6d3ce70e81b3132048093d969bd5918633dab5 Mon Sep 17 00:00:00 2001 From: yurkovychv Date: Wed, 10 Jul 2024 20:24:36 +0300 Subject: [PATCH 2/5] PMM-13228 add schedules --- .github/workflows/fb-e2e-suite.yml | 3 +++ .github/workflows/fb-integration-suite.yml | 3 +++ .github/workflows/fb-tarball-suite.yml | 5 ++++- .github/workflows/helm-tests.yml | 3 +++ .github/workflows/integration-cli-tests.yml | 3 +++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fb-e2e-suite.yml b/.github/workflows/fb-e2e-suite.yml index 082e0f7c..636bd16e 100644 --- a/.github/workflows/fb-e2e-suite.yml +++ b/.github/workflows/fb-e2e-suite.yml @@ -1,6 +1,9 @@ name: _FB e2e tests on: + schedule: + - cron: '0 3 * * *' # Every night at 3 AM UTC + workflow_dispatch: inputs: pmm_ui_tests_branch: diff --git a/.github/workflows/fb-integration-suite.yml b/.github/workflows/fb-integration-suite.yml index 00267b43..877a1598 100644 --- a/.github/workflows/fb-integration-suite.yml +++ b/.github/workflows/fb-integration-suite.yml @@ -1,6 +1,9 @@ name: _FB integration CLI tests on: + schedule: + - cron: '0 3 * * *' # Every night at 3 AM UTC + workflow_dispatch: inputs: pmm_ui_tests_branch: diff --git a/.github/workflows/fb-tarball-suite.yml b/.github/workflows/fb-tarball-suite.yml index c250d50c..58c32101 100644 --- a/.github/workflows/fb-tarball-suite.yml +++ b/.github/workflows/fb-tarball-suite.yml @@ -1,6 +1,9 @@ name: _FB tarball tests on: + schedule: + - cron: '0 3 * * *' # Every night at 3 AM UTC + workflow_dispatch: inputs: package_testing_branch: @@ -74,4 +77,4 @@ jobs: pmm_client_tarball: ${{ inputs.pmm_client_tarball || 'dev-latest' }} playbook: 'pmm2-client_integration_upgrade_custom_path' test_name: 'tarball upgrade' - sha: ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }} \ No newline at end of file + sha: ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }} diff --git a/.github/workflows/helm-tests.yml b/.github/workflows/helm-tests.yml index 360145de..70cfc550 100644 --- a/.github/workflows/helm-tests.yml +++ b/.github/workflows/helm-tests.yml @@ -1,4 +1,7 @@ on: + schedule: + - cron: '0 3 * * *' # Every night at 3 AM UTC + workflow_dispatch: inputs: server_image: diff --git a/.github/workflows/integration-cli-tests.yml b/.github/workflows/integration-cli-tests.yml index 7d255b52..212ea9f3 100644 --- a/.github/workflows/integration-cli-tests.yml +++ b/.github/workflows/integration-cli-tests.yml @@ -1,6 +1,9 @@ name: PMM Integration Tests on: + schedule: + - cron: '0 3 * * *' # Every night at 3 AM UTC + workflow_dispatch: inputs: pmm_ui_tests_branch: From 3e7eb08f3fa9e3337d499d79c65d90b2ebbba641 Mon Sep 17 00:00:00 2001 From: yurkovychv Date: Wed, 10 Jul 2024 20:35:31 +0300 Subject: [PATCH 3/5] PMM-13228 tweaks --- .github/workflows/runner-e2e-tests-codeceptjs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/runner-e2e-tests-codeceptjs.yml b/.github/workflows/runner-e2e-tests-codeceptjs.yml index c6ef9bad..aa54962d 100644 --- a/.github/workflows/runner-e2e-tests-codeceptjs.yml +++ b/.github/workflows/runner-e2e-tests-codeceptjs.yml @@ -150,9 +150,11 @@ jobs: run: | local_version=$(pmm-admin version --json) local_full_commit=$(echo $local_version | jq -r '.fullCommit') + echo "local_full_commit=$local_full_commit" container_version=$(docker exec pmm-server pmm-admin version --json) container_full_commit=$(echo $container_version | jq -r '.fullCommit') + echo "container_full_commit=$container_full_commit" if [[ "$local_full_commit" != "$container_full_commit" ]]; then echo "Commits for pmm-server and pmm-client are different! Check the versions!" From 4f9fe9aa11e6f9d7fcec94df1bafb10c3d35b21f Mon Sep 17 00:00:00 2001 From: yurkovychv Date: Wed, 10 Jul 2024 20:51:01 +0300 Subject: [PATCH 4/5] PMM-13228 tweaks --- .github/workflows/runner-e2e-tests-codeceptjs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/runner-e2e-tests-codeceptjs.yml b/.github/workflows/runner-e2e-tests-codeceptjs.yml index aa54962d..12fbb87e 100644 --- a/.github/workflows/runner-e2e-tests-codeceptjs.yml +++ b/.github/workflows/runner-e2e-tests-codeceptjs.yml @@ -149,11 +149,11 @@ jobs: shell: bash run: | local_version=$(pmm-admin version --json) - local_full_commit=$(echo $local_version | jq -r '.fullCommit') + local_full_commit=$(echo $local_version | jq -r '.FullCommit') echo "local_full_commit=$local_full_commit" container_version=$(docker exec pmm-server pmm-admin version --json) - container_full_commit=$(echo $container_version | jq -r '.fullCommit') + container_full_commit=$(echo $container_version | jq -r '.FullCommit') echo "container_full_commit=$container_full_commit" if [[ "$local_full_commit" != "$container_full_commit" ]]; then From 54b50a62f99bdcea818d1272ec6bb39caffefa60 Mon Sep 17 00:00:00 2001 From: yurkovychv Date: Wed, 10 Jul 2024 20:51:29 +0300 Subject: [PATCH 5/5] PMM-13228 tweaks --- .github/workflows/runner-e2e-tests-codeceptjs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runner-e2e-tests-codeceptjs.yml b/.github/workflows/runner-e2e-tests-codeceptjs.yml index 12fbb87e..5e604f74 100644 --- a/.github/workflows/runner-e2e-tests-codeceptjs.yml +++ b/.github/workflows/runner-e2e-tests-codeceptjs.yml @@ -145,7 +145,7 @@ jobs: run: sudo bash -x pmm-tests/pmm2-client-setup.sh --pmm_server_ip 192.168.0.1 --client_version ${{ env.PMM_CLIENT_VERSION }} --admin_password ${{ env.ADMIN_PASSWORD }} --use_metrics_mode no - name: Compare FullCommit for pmm-server and pmm-client - if: contains(inputs.pmm_server_image, 'dev-latest') && contains(inputs.pmm_client_version, 'dev-latest') + if: ${{ contains(inputs.pmm_server_image, 'dev-latest') && contains(inputs.pmm_client_version, 'dev-latest') }} shell: bash run: | local_version=$(pmm-admin version --json)