diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70ee26273..4963080ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,9 +72,11 @@ jobs: - name: "Disable mysqld apparmor profile" if: matrix.platforms.provider == 'provision::docker' - run: | + 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: | @@ -99,4 +101,3 @@ jobs: continue-on-error: true run: | bundle exec rake 'litmus:tear_down' - diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 29f22a679..cd9bbdf02 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -74,6 +74,8 @@ jobs: 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: | @@ -98,4 +100,3 @@ jobs: continue-on-error: true run: | bundle exec rake 'litmus:tear_down' - diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index 1896fc458..5cad805a4 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -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