Skip to content

Commit e296d2a

Browse files
PSMDB. Run tests for all major versions
1 parent 28269d0 commit e296d2a

File tree

3 files changed

+77
-12
lines changed

3 files changed

+77
-12
lines changed

.github/workflows/PMM_PSMDB_PBM.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@ on:
2020
default: "perconalab/pmm-server:3-dev-latest"
2121
required: false
2222

23-
push:
24-
branches:
25-
- main
26-
- v3
27-
28-
pull_request:
29-
branches:
30-
- main
31-
- v3
32-
3323
jobs:
3424
test_replica_set:
3525
runs-on: ubuntu-22.04
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: PMM_PSMDB_PBM_FULL
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
pmm_version:
7+
description: "pmm2-client version"
8+
default: "3-dev-latest"
9+
required: false
10+
pmm_image:
11+
description: "pmm-server docker image"
12+
default: "perconalab/pmm-server:3-dev-latest"
13+
required: false
14+
15+
push:
16+
branches:
17+
- main
18+
- v3
19+
20+
pull_request:
21+
branches:
22+
- main
23+
- v3
24+
25+
jobs:
26+
test_replica_set:
27+
runs-on: ubuntu-22.04
28+
timeout-minutes: 20
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
psmdb: ["6.0", "7.0", "8.0"]
33+
env:
34+
PMM_CLIENT_VERSION: ${{ inputs.pmm_version || '3-dev-latest' }}
35+
PMM_IMAGE: ${{ inputs.pmm_image || 'perconalab/pmm-server:3-dev-latest' }}
36+
steps:
37+
- uses: actions/checkout@v2
38+
- name: Test RS with PSMDB ${{ matrix.psmdb }}
39+
run: |
40+
PSMDB_VERSION=${{ matrix.psmdb }} ./start-rs.sh
41+
working-directory: ./pmm_psmdb-pbm_setup
42+
43+
test_sharded_cluster:
44+
runs-on: ubuntu-22.04
45+
timeout-minutes: 20
46+
strategy:
47+
fail-fast: false
48+
matrix:
49+
psmdb: ["6.0", "7.0", "8.0"]
50+
env:
51+
PMM_CLIENT_VERSION: ${{ inputs.pmm_version || '3-dev-latest' }}
52+
PMM_IMAGE: ${{ inputs.pmm_image || 'perconalab/pmm-server:3-dev-latest' }}
53+
steps:
54+
- uses: actions/checkout@v2
55+
- name: Test sharded with PSMDB ${{ matrix.psmdb }}
56+
run: |
57+
PSMDB_VERSION=${{ matrix.psmdb }} ./start-sharded.sh
58+
working-directory: ./pmm_psmdb-pbm_setup
59+
60+
test_diff_auth:
61+
runs-on: ubuntu-22.04
62+
timeout-minutes: 20
63+
strategy:
64+
fail-fast: false
65+
matrix:
66+
psmdb: ["6.0", "7.0", "8.0"]
67+
env:
68+
PMM_CLIENT_VERSION: ${{ inputs.pmm_version || '3-dev-latest' }}
69+
PMM_IMAGE: ${{ inputs.pmm_image || 'perconalab/pmm-server:3-dev-latest' }}
70+
steps:
71+
- uses: actions/checkout@v3
72+
- name: Test auth with PSMDB ${{ matrix.psmdb }}
73+
run: |
74+
PSMDB_VERSION=${{ matrix.psmdb }} ./test-auth.sh
75+
working-directory: ./pmm_psmdb_diffauth_setup

pmm_psmdb-pbm_setup/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN set -ex; \
2222
export GNUPGHOME="$(mktemp -d)"; \
2323
export PERCONA_TELEMETRY_URL="https://check-dev.percona.com/v1/telemetry/GenericReport"; \
2424
yum install -y gnupg2; \
25-
if [ $PSMDB_VERSION != "latest" ]; then export PSMDB_REPO="$(echo "${PSMDB_VERSION}" | awk -F '.' '{print "psmdb-"$1$2}')" ; else export PSMDB_REPO=psmdb-60 ; fi ; \
25+
if [ $PSMDB_VERSION != "latest" ]; then export PSMDB_REPO="$(echo "${PSMDB_VERSION}" | awk -F '.' '{print "psmdb-"$1$2}')" ; else export PSMDB_REPO=psmdb-80 ; fi ; \
2626
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 4D1BB29D63D98E422B2113B19334A25F8507EFA5 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \
2727
gpg --batch --export --armor 4D1BB29D63D98E422B2113B19334A25F8507EFA5 > ${GNUPGHOME}/PERCONA-PACKAGING-KEY; \
2828
gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
@@ -38,7 +38,7 @@ RUN set -ex; \
3838
percona-release enable pmm3-client ${PMM_REPO} && \
3939
yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
4040
yum update --refresh -y && \
41-
if [ $PSMDB_VERSION == "latest" ]; then \
41+
if [[ $PSMDB_VERSION == "latest" || "$PSMDB_VERSION" =~ ^[0-9]\.[0-9]$ ]] ; then \
4242
yum -y install percona-server-mongodb \
4343
percona-server-mongodb-tools \
4444
percona-server-mongodb-server \

0 commit comments

Comments
 (0)