Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMM-13086 bump worker #676

Closed
wants to merge 14 commits into from
8 changes: 6 additions & 2 deletions .github/workflows/fb-e2e-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ jobs:
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
setup_services: '--database psmdb,SETUP_TYPE=pss'
direct_mongo_setup_script: 'start-rs-only.sh'
# setup_services: '--database psmdb,SETUP_TYPE=pss,COMPOSE_PROFILES=extra'
tags_for_tests: '@bm-mongo'

Expand Down Expand Up @@ -104,6 +105,7 @@ jobs:
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
sha: ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }}
setup_services: '--database psmdb,SETUP_TYPE=pss'
direct_mongo_setup_script: 'start-rs-only.sh'
# tags_for_tests: '@bm-common|@bm-locations' -- include bm-common once setup for mysql fixed
tags_for_tests: '@bm-locations'

Expand All @@ -118,7 +120,8 @@ jobs:
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
sha: ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }}
setup_services: '--database psmdb --database ps,QUERY_SOURCE=slowlog'
setup_services: '--database ps,QUERY_SOURCE=slowlog'
direct_mongo_setup_script: 'start-rs-only.sh'
tags_for_tests: '@mongodb-exporter|@exporters'

instances:
Expand Down Expand Up @@ -160,7 +163,8 @@ jobs:
pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'v3' }}
pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
sha: ${{ inputs.sha || github.event.pull_request.head.sha || 'null' }}
setup_services: '--database ps --database psmdb --database pdpgsql'
setup_services: '--database ps --database pdpgsql'
direct_mongo_setup_script: 'start-rs-only.sh'
tags_for_tests: '@user-password'

pgsm:
Expand Down
24 changes: 20 additions & 4 deletions .github/workflows/runner-e2e-tests-codeceptjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ on:
description: "Setup arguments, ex.: --database=ps --database=psmdb"
required: false
type: string
direct_mongo_setup_script:
description: "setup psmdb without framework with command like: './start-rs-only.sh'"
type: string
tags_for_tests:
description: "example: @settings-fb"
required: true
Expand Down Expand Up @@ -59,6 +62,9 @@ on:
setup_services:
required: false
type: string
direct_mongo_setup_script:
required: false
type: string
tags_for_tests:
required: true
type: string
Expand All @@ -70,7 +76,7 @@ jobs:
ui-tests-e2e:
name: "e2e tests: ${{ inputs.tags_for_tests || '@settings-fb' }}"
# runs-on: ubuntu-latest Mongo Replica setup fails in ubuntu-latest for some reason. Additional investigation needed
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
timeout-minutes: 60
env:
SHA: ${{ inputs.sha || 'null' }}
Expand All @@ -83,6 +89,7 @@ jobs:
CLIENT_DOCKER_VERSION: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
PMM_CLIENT_VERSION: ${{ inputs.pmm_client_version || '3-dev-latest' }}
WIZARD_ARGS: ${{ inputs.setup_services || '' }}
DIRECT_MONGO_SETUP_SCRIPT: ${{ inputs.direct_mongo_setup_script || '' }}
TAGS_FOR_TESTS: ${{ inputs.tags_for_tests || '@settings-fb' }}


Expand Down Expand Up @@ -141,7 +148,16 @@ jobs:
working-directory: qa-integration/pmm_qa
run: sudo bash -x pmm3-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: Run PSMDB direct setup script
# if: ${{ env.DIRECT_MONGO_SETUP_SCRIPT != '' }}
# working-directory: qa-integration/pmm_psmdb-pbm_setup
# run: bash ${{ env.DIRECT_MONGO_SETUP_SCRIPT }}
- name: Setup tmate session
if: ${{ always() }}
uses: percona/gh-action-action-tmate@v2

- name: Run Setup for E2E Tests
# if: ${{ !contains(env.WIZARD_ARGS, 'psmdb') }}
working-directory: qa-integration/pmm_qa
run: |
mkdir -m 777 -p /tmp/backup_data
Expand Down Expand Up @@ -195,6 +211,6 @@ jobs:
target_url: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
sha: ${{ env.SHA }}

# - name: Setup tmate session on failure
# if: ${{ failure() }}
# uses: percona-platform/action-tmate@v2
# - name: Setup tmate session on failure
# if: ${{ always() }}
# uses: percona/gh-action-action-tmate@v2
Loading