Skip to content

Commit

Permalink
491-CI-fix-tarball-download (ansible-collections#491)
Browse files Browse the repository at this point in the history
* 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 <laurent.indermuehle@pm.me>
  • Loading branch information
Jorge-Rodriguez and laurent-indermuehle authored Jan 24, 2023
1 parent 930a5a5 commit 00fa058
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
16 changes: 6 additions & 10 deletions .github/workflows/ansible-test-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ jobs:
- mysql_5.7.31
- mysql_8.0.22
- mariadb_10.3.34
# When adding later versions below,
# also change the "Set MariaDB URL sub dir" task
- mariadb_10.8.3
ansible:
- stable-2.12
Expand Down Expand Up @@ -99,14 +97,12 @@ jobs:
DB_ENGINE_PRETTY=$([[ "${DB_ENGINE}" == 'mysql' ]] && echo 'MySQL' || echo 'MariaDB');
>&2 echo Matrix factor for the DB is ${{ matrix.db_engine_version }}...;
>&2 echo Setting ${DB_ENGINE_PRETTY} version to ${DB_VERSION}...;
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 }}';
${{
matrix.db_engine_version == 'mariadb_10.8.3'
&& format(
'>&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
)
|| ''
}}
sed -i -e "s/^${DB_ENGINE}_version:.*/${DB_ENGINE}_version: $DB_VERSION/g" '${{ env.mysql_version_file }}';
if [[ ${{ matrix.db_engine_version }} == mariadb* ]];
then
echo Set MariaDB install flag...; sed -i -e "s/^mariadb_install: false/mariadb_install: true/g" '${{ env.mysql_version_file }}';
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 }}';
fi;
>&2 echo Setting Connector version to ${{ matrix.connector }}...;
sed -i 's/^python_packages:.*/python_packages: [${{ matrix.connector }}]/' ${{ env.connector_version_file }}
target-python-version: ${{ matrix.python }}
Expand Down
3 changes: 3 additions & 0 deletions changelogs/fragments/491_fix_download_url.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
minor_changes:
- setup_mysql - update MySQL tarball URL (https://github.com/ansible-collections/community.mysql/pull/491).
2 changes: 1 addition & 1 deletion tests/integration/targets/setup_mysql/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ install_python_prereqs:
- build-essential

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

0 comments on commit 00fa058

Please sign in to comment.