From 00fa058a18c82e395a1064e7fd7f41d0dc259fdd Mon Sep 17 00:00:00 2001
From: "Jorge Rodriguez (A.K.A. Tiriel)" <jorge.rodriguez@futurice.com>
Date: Tue, 24 Jan 2023 19:12:35 +0200
Subject: [PATCH] 491-CI-fix-tarball-download (#491)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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>
---
 .github/workflows/ansible-test-plugins.yml       | 16 ++++++----------
 changelogs/fragments/491_fix_download_url.yaml   |  3 +++
 .../targets/setup_mysql/vars/main.yml            |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 changelogs/fragments/491_fix_download_url.yaml

diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml
index 27c657fd..ea6ae8ef 100644
--- a/.github/workflows/ansible-test-plugins.yml
+++ b/.github/workflows/ansible-test-plugins.yml
@@ -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
@@ -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 }}
diff --git a/changelogs/fragments/491_fix_download_url.yaml b/changelogs/fragments/491_fix_download_url.yaml
new file mode 100644
index 00000000..27628bbb
--- /dev/null
+++ b/changelogs/fragments/491_fix_download_url.yaml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - setup_mysql - update MySQL tarball URL (https://github.com/ansible-collections/community.mysql/pull/491).
diff --git a/tests/integration/targets/setup_mysql/vars/main.yml b/tests/integration/targets/setup_mysql/vars/main.yml
index 4aa52a29..8fbcd905 100644
--- a/tests/integration/targets/setup_mysql/vars/main.yml
+++ b/tests/integration/targets/setup_mysql/vars/main.yml
@@ -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 }}"