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.

Sign up for GitHub

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

Jump to bottom

(CONT-1203) - Fixing CI pipeline for Debian & Ubuntu-20 #1583

Merged
merged 1 commit into from
Jul 13, 2023
Merged

(CONT-1203) - Fixing CI pipeline for Debian & Ubuntu-20 #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ jobs:
bundle env

- name: "Disable mysqld apparmor profile"
if: matrix.platforms.provider == 'provision::docker'
run: |
if: ${{matrix.platforms.provider == 'docker'}}
run: |
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
sudo systemctl disable apparmor
sudo systemctl stop apparmor

- name: Provision test environment
run: |
Expand All @@ -99,4 +101,3 @@ jobs:
continue-on-error: true
run: |
bundle exec rake 'litmus:tear_down'

5 changes: 3 additions & 2 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@ jobs:
bundle env

- name: "Disable mysqld apparmor profile"
if: matrix.platforms.provider == 'provision::docker'
if: ${{matrix.platforms.provider == 'docker'}}
run: |
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/disable/usr.sbin.mysqld
sudo systemctl disable apparmor
sudo systemctl stop apparmor

- name: Provision test environment
run: |
Expand All @@ -98,4 +100,3 @@ jobs:
continue-on-error: true
run: |
bundle exec rake 'litmus:tear_down'

2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance_local.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def mysql_version
shell_output = LitmusHelper.instance.run_shell('mysql --version', expect_failures: true)
if shell_output.stdout.match(%r{\d+\.\d+\.\d+}).nil?
# mysql is not yet installed, so we apply this class to install it
LitmusHelper.instance.apply_manifest('include mysql::server', debug: true, catch_failures: true)
LitmusHelper.instance.apply_manifest('include mysql::server', catch_failures: true)
shell_output = LitmusHelper.instance.run_shell('mysql --version')
raise _('unable to get mysql version') if shell_output.stdout.match(%r{\d+\.\d+\.\d+}).nil?
end
Expand Down