Skip to content

Commit 4a49c1d

Browse files
authored
MySQL test changes on SLES (#1866)
1 parent bf9f561 commit 4a49c1d

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

integration_test/third_party_apps_test/applications/mysql/metadata.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ platforms_to_skip:
3535
# MySQL is not currently supported on various distros.
3636
- debian-cloud:debian-12
3737
- debian-cloud:debian-12-arm64
38+
- suse-cloud:sles-12
3839
- suse-cloud:sles-15-arm64
40+
- suse-sap-cloud:sles-12-sp5-sap
3941
supported_app_version: ["5.7", "8.0"]
4042
expected_metrics:
4143
- type: workload.googleapis.com/mysql.buffer_pool_data_pages

integration_test/third_party_apps_test/applications/mysql/sles/install

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,24 @@ if [[ "${ID}" == opensuse-leap && "${VERSION_ID}" == 15.[01] ]]; then
1414
sudo zypper -n install mariadb
1515
else
1616
mysql_repo_pkg_name=''
17-
if [[ "${SUSE_VERSION}" == 12 ]]; then
18-
mysql_repo_pkg_name=mysql80-community-release-sles12.rpm
19-
elif [[ "${SUSE_VERSION}" == 15 ]]; then
20-
mysql_repo_pkg_name=mysql80-community-release-sl15.rpm
17+
if [[ "${SUSE_VERSION}" == 15 ]]; then
18+
mysql_repo_pkg_name=mysql84-community-release-sl15-1.noarch.rpm
2119
fi
2220

2321
# Installation followed in: https://dev.mysql.com/doc/mysql-sles-repo-quick-guide/en/
2422
sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2023
2523
sudo rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022
26-
sudo zypper -n install https://dev.mysql.com/get/${mysql_repo_pkg_name}
24+
wget --output-document mysql-repos.rpm https://dev.mysql.com/get/${mysql_repo_pkg_name}
25+
sudo rpm -Uvh mysql-repos.rpm
26+
sudo zypper modifyrepo --disable mysql-8.4-lts-community
27+
sudo zypper modifyrepo --disable mysql-connectors-community
28+
sudo zypper modifyrepo --disable mysql-tools-8.4-lts-community
29+
sudo zypper modifyrepo --enable mysql80-community
30+
sudo zypper refresh
2731
sudo zypper -n install mysql-community-server
2832
fi
2933

30-
if [[ "${SUSE_VERSION}" == 12 ]]; then
31-
sudo zypper -n install libmysqlclient18
32-
elif [[ "${SUSE_VERSION}" == 15 ]]; then
34+
if [[ "${SUSE_VERSION}" == 15 ]]; then
3335
sudo zypper -n install libmariadb3
3436
fi
3537

integration_test/third_party_apps_test/applications/mysql5.7/metadata.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ minimum_supported_agent_version:
3737
supported_operating_systems: linux
3838
platforms_to_skip:
3939
# MySQL5.7 is not supported on various distros.
40+
- suse-cloud:sles-12
4041
- suse-cloud:sles-15
4142
- suse-cloud:sles-15-arm64
43+
- suse-sap-cloud:sles-12-sp5-sap
4244
- rocky-linux-cloud:rocky-linux-8
4345
- rocky-linux-cloud:rocky-linux-8-optimized-gcp
4446
- rocky-linux-cloud:rocky-linux-8-optimized-gcp-arm64

0 commit comments

Comments
 (0)