ansible-collections/community.mysql
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.mysql.git synced 2025-04-28 05:11:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix server_id in GHA

Browse source 
GHA lack a way to pass option to docker's command. Also server_id is
not read as a environment variable. So I'm forced to use a config file.
This commit is contained in:
Laurent Indermuehle 2023-01-05 11:48:39 +01:00
parent 9e3010dd00
commit 2af8e4f273
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
4 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/ansible-test-plugins.yml vendored
View file

@ -101,8 +101,8 @@ jobs:
MYSQL_ROOT_PASSWORD: msandbox MYSQL_ROOT_PASSWORD: msandbox
ports: ports:
- 3308:3306 - 3308:3306
options: >- volumes:
--server_id 2 - tests/integration/setup_mysql/replica1:/etc/mysql/conf.d/
db_replica2: db_replica2:
image: ${{ matrix.db_engine_version }} image: ${{ matrix.db_engine_version }}
@ -111,8 +111,8 @@ jobs:
MYSQL_ROOT_PASSWORD: msandbox MYSQL_ROOT_PASSWORD: msandbox
ports: ports:
- 3309:3306 - 3309:3306
options: >- volumes:
--server_id 3 - tests/integration/setup_mysql/replica2:/etc/mysql/conf.d/
steps: steps:
- name: 'Wait 20s for the service containers to be healthy' - name: 'Wait 20s for the service containers to be healthy'

10
Makefile
View file

@ -17,8 +17,9 @@ test-integration:
--network podman \ --network podman \
--publish 3308:3306 \ --publish 3308:3306 \
--health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \ --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \
mysql:8.0.22 \ --security-opt label=disable \
--server_id 2 --volume ./tests/integration/targets/setup_mysql/replica1/:/etc/mysql/conf.d/ \
mysql:8.0.22
podman run \ podman run \
--detach \ --detach \
--name replica2 \ --name replica2 \
@ -27,8 +28,9 @@ test-integration:
--network podman \ --network podman \
--publish 3309:3306 \ --publish 3309:3306 \
--health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \ --health-cmd 'mysqladmin ping -P 3306 -pmsandbox | grep alive || exit 1' \
mysql:8.0.22 \ --security-opt label=disable \
--server_id 3 --volume ./tests/integration/targets/setup_mysql/replica2/:/etc/mysql/conf.d/ \
mysql:8.0.22
while ! podman healthcheck run primary && [[ "$$SECONDS" -lt 120 ]]; do sleep 1; done while ! podman healthcheck run primary && [[ "$$SECONDS" -lt 120 ]]; do sleep 1; done
-set -x; ansible-test integration -v --color --coverage --retry-on-error --continue-on-error --diff --docker --docker-network podman --python 3.8; set +x -set -x; ansible-test integration -v --color --coverage --retry-on-error --continue-on-error --diff --docker --docker-network podman --python 3.8; set +x
podman stop --time 0 --ignore primary podman stop --time 0 --ignore primary

4
tests/integration/targets/setup_mysql/replica1/mysql.cnf Normal file
View file

@ -0,0 +1,4 @@
[mysqld]
skip-host-cache
skip-name-resolve
server_id = 2

4
tests/integration/targets/setup_mysql/replica2/mysql.cnf Normal file
View file

@ -0,0 +1,4 @@
[mysqld]
skip-host-cache
skip-name-resolve
server_id = 3