From bdafbe7fa0568896c00b7fb6818c54e407a97526 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Mon, 14 Oct 2024 13:51:37 -0400 Subject: [PATCH 1/2] Actions: disable AppArmor (a manual backport of #12515) --- .github/workflows/test-plugin-mixed.yaml | 4 ++-- .github/workflows/test-plugin.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-plugin-mixed.yaml b/.github/workflows/test-plugin-mixed.yaml index 9de3f8acac4a..b435834e49a7 100644 --- a/.github/workflows/test-plugin-mixed.yaml +++ b/.github/workflows/test-plugin-mixed.yaml @@ -98,11 +98,11 @@ jobs: run: | sudo apt-get update && \ sudo apt-get install -y \ - apparmor-utils \ ldap-utils \ slapd - sudo aa-complain `which slapd` + systemctl is-active --quiet apparmor.service && systemctl stop apparmor.service + systemctl disable apparmor.service cat << EOF >> user.bazelrc build --strategy=TestRunner=local diff --git a/.github/workflows/test-plugin.yaml b/.github/workflows/test-plugin.yaml index 3998013c03eb..889f13f8a579 100644 --- a/.github/workflows/test-plugin.yaml +++ b/.github/workflows/test-plugin.yaml @@ -95,11 +95,11 @@ jobs: run: | sudo apt-get update && \ sudo apt-get install -y \ - apparmor-utils \ ldap-utils \ slapd - sudo aa-complain `which slapd` + systemctl is-active --quiet apparmor.service && systemctl stop apparmor.service + systemctl disable apparmor.service cat << EOF >> user.bazelrc build --strategy=TestRunner=local From 43805cade7a02b524aec666a95daa5e24c1b2214 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Mon, 14 Oct 2024 14:05:17 -0400 Subject: [PATCH 2/2] Actions: use sudo with 'service' --- .github/workflows/test-plugin-mixed.yaml | 4 ++-- .github/workflows/test-plugin.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-plugin-mixed.yaml b/.github/workflows/test-plugin-mixed.yaml index b435834e49a7..bc3882a3f19c 100644 --- a/.github/workflows/test-plugin-mixed.yaml +++ b/.github/workflows/test-plugin-mixed.yaml @@ -101,8 +101,8 @@ jobs: ldap-utils \ slapd - systemctl is-active --quiet apparmor.service && systemctl stop apparmor.service - systemctl disable apparmor.service + sudo systemctl is-active --quiet apparmor.service && sudo systemctl stop apparmor.service + sudo systemctl disable apparmor.service cat << EOF >> user.bazelrc build --strategy=TestRunner=local diff --git a/.github/workflows/test-plugin.yaml b/.github/workflows/test-plugin.yaml index 889f13f8a579..ee96f61fa746 100644 --- a/.github/workflows/test-plugin.yaml +++ b/.github/workflows/test-plugin.yaml @@ -98,8 +98,8 @@ jobs: ldap-utils \ slapd - systemctl is-active --quiet apparmor.service && systemctl stop apparmor.service - systemctl disable apparmor.service + sudo systemctl is-active --quiet apparmor.service && sudo systemctl stop apparmor.service + sudo systemctl disable apparmor.service cat << EOF >> user.bazelrc build --strategy=TestRunner=local