Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mysql_odbc: fix test for Tumbleweed #11353

Merged
merged 2 commits into from Nov 5, 2020
Merged

Conversation

ggardet
Copy link
Collaborator

@ggardet ggardet commented Nov 5, 2020

@ggardet ggardet added the WIP Work in progress label Nov 5, 2020
@ggardet ggardet changed the title mysql_odbc: add verbose flag to help to debug failures mysql_odbc: fix test for Tumbleweed Nov 5, 2020
@ggardet ggardet removed the WIP Work in progress label Nov 5, 2020
@Vogtinator
Copy link
Member

Oh, I was about to file a PR with a similar change, but you were quicker.

I'm doing

+    if (is_sle('<15') || is_leap('<15.0')) {
+        assert_script_run 'echo Driver=$(rpm --eval "%_libdir")/libmyodbc5.so >> /etc/unixODBC/odbcinst.ini';
+    } else {
+        assert_script_run 'echo Driver=$(rpm -ql mariadb-connector-odbc | grep -E libmaodbc.so\$) >> /etc/unixODBC/odbcinst.ini';
+    }

instead which doesn't depend on is_tumbleweed (which doesn't match the next Leap) and I fixed

assert_script_run 'echo Setup=$(rpm --eval "%_libdir")/unixODBC/libodbcmyS.so >> /etc/unixODBC/odbcinst.ini';

as well, which had a wrong path.

@ggardet
Copy link
Collaborator Author

ggardet commented Nov 5, 2020

@Vogtinator I updated the PR with your suggestions and started a new verification run. Thanks for the review!

@Vogtinator
Copy link
Member

Some VRs with reduced schedule and using JeOS to avoid the installation:

15.2: https://openqa.opensuse.org/tests/1460530
TW: https://openqa.opensuse.org/tests/1460531

Copy link
Member

@Vogtinator Vogtinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VRs passed

@ggardet ggardet removed the request for review from DimStar77 November 5, 2020 13:30
@ggardet ggardet merged commit 53ddd1e into os-autoinst:master Nov 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants