Skip to content

Commit 00fa058

Browse files
491-CI-fix-tarball-download (#491)
* Fix mariadb test setup * Update mysql src URL * Add changelog fragment * Update 491_fix_download_url.yaml Sanity test failed because minor_changes in not an element of a list. * Fix casing Co-authored-by: Laurent Indermühle <[email protected]>
1 parent 930a5a5 commit 00fa058

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

.github/workflows/ansible-test-plugins.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ jobs:
4747
- mysql_5.7.31
4848
- mysql_8.0.22
4949
- mariadb_10.3.34
50-
# When adding later versions below,
51-
# also change the "Set MariaDB URL sub dir" task
5250
- mariadb_10.8.3
5351
ansible:
5452
- stable-2.12
@@ -99,14 +97,12 @@ jobs:
9997
DB_ENGINE_PRETTY=$([[ "${DB_ENGINE}" == 'mysql' ]] && echo 'MySQL' || echo 'MariaDB');
10098
>&2 echo Matrix factor for the DB is ${{ matrix.db_engine_version }}...;
10199
>&2 echo Setting ${DB_ENGINE_PRETTY} version to ${DB_VERSION}...;
102-
sed -i -e "s/^${DB_ENGINE}_version:.*/${DB_ENGINE}_version: $DB_VERSION/g" -e 's/^mariadb_install: false/mariadb_install: true/g' '${{ env.mysql_version_file }}';
103-
${{
104-
matrix.db_engine_version == 'mariadb_10.8.3'
105-
&& format(
106-
'>&2 echo Set MariaDB v10.8.3 URL sub dir...; sed -i -e "s/^mariadb_url_subdir:.*/mariadb_url_subdir: linux-systemd/g" "{0}";', env.connector_version_file
107-
)
108-
|| ''
109-
}}
100+
sed -i -e "s/^${DB_ENGINE}_version:.*/${DB_ENGINE}_version: $DB_VERSION/g" '${{ env.mysql_version_file }}';
101+
if [[ ${{ matrix.db_engine_version }} == mariadb* ]];
102+
then
103+
echo Set MariaDB install flag...; sed -i -e "s/^mariadb_install: false/mariadb_install: true/g" '${{ env.mysql_version_file }}';
104+
echo Set MariaDB v10.8.3 URL sub dir...; sed -i -e "s/^mariadb_url_subdir:.*/mariadb_url_subdir: linux-systemd/g" '${{ env.connector_version_file }}';
105+
fi;
110106
>&2 echo Setting Connector version to ${{ matrix.connector }}...;
111107
sed -i 's/^python_packages:.*/python_packages: [${{ matrix.connector }}]/' ${{ env.connector_version_file }}
112108
target-python-version: ${{ matrix.python }}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
minor_changes:
3+
- setup_mysql - update MySQL tarball URL (https://github.com/ansible-collections/community.mysql/pull/491).

tests/integration/targets/setup_mysql/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ install_python_prereqs:
2424
- build-essential
2525

2626
mysql_tarball: "mysql-{{ mysql_version }}-linux-glibc2.12-x86_64.tar.{{ mysql_compression_extension }}"
27-
mysql_src: "https://dev.mysql.com/get/Downloads/MySQL-{{ mysql_major_version }}/{{ mysql_tarball }}"
27+
mysql_src: "https://cdn.mysql.com/archives/mysql-{{ mysql_major_version }}/{{ mysql_tarball }}"
2828
mariadb_url_subdir: "linux"
2929
mariadb_tarball: "mariadb-{{ mariadb_version }}-{{ mariadb_url_subdir }}-x86_64.tar.gz"
3030
mariadb_src: "https://downloads.mariadb.com/MariaDB/mariadb-{{ mariadb_version }}/bintar-{{ mariadb_url_subdir }}-x86_64/{{ mariadb_tarball }}"

0 commit comments

Comments
 (0)