On 3/13/25 12:05 PM, Ales Musil wrote:
> On Thu, Mar 13, 2025 at 11:16 AM Dumitru Ceara <dce...@redhat.com> wrote:
>
>> Commit 407a9426d78a ("ci: Bump the Ubuntu image to 24.04.") already did
>> that for unit tests and system tests running in containers. We should
>> also do it for the containers that run as part of the
>> ovn-fake-multinode-tests to avoid AppArmor permission issues.
>>
>> Signed-off-by: Dumitru Ceara <dce...@redhat.com>
>> ---
>> .ci/linux-util.sh | 8 ++++++++
>> .github/workflows/ovn-fake-multinode-tests.yml | 5 +++++
>> 2 files changed, 13 insertions(+)
>>
>> diff --git a/.ci/linux-util.sh b/.ci/linux-util.sh
>> index 9203451235..a4802ff2d1 100755
>> --- a/.ci/linux-util.sh
>> +++ b/.ci/linux-util.sh
>> @@ -17,3 +17,11 @@ function free_up_disk_space_ubuntu()
>> /usr/local/share/boost/'
>> sudo rm -rf $paths
>> }
>> +
>> +function set_containers_apparmor_profile()
>> +{
>> + local profile=$1
>> +
>> + sed -i "s/^#apparmor_profile = \".*\"$/apparmor_profile =
>> \"$profile\"/" \
>> + /usr/share/containers/containers.conf
>> +}
>> diff --git a/.github/workflows/ovn-fake-multinode-tests.yml
>> b/.github/workflows/ovn-fake-multinode-tests.yml
>> index ea08c5a1b1..06b7d9b98d 100644
>> --- a/.github/workflows/ovn-fake-multinode-tests.yml
>> +++ b/.github/workflows/ovn-fake-multinode-tests.yml
>> @@ -114,6 +114,11 @@ jobs:
>> . .ci/linux-util.sh
>> free_up_disk_space_ubuntu
>>
>> + - name: Set podman apparmor=unconfined
>> + run: |
>> + . .ci/linux-util.sh
>> + set_containers_apparmor_profile unconfined
>> +
>> - uses: actions/download-artifact@v4
>> with:
>> name: test-${{ github.ref_name }}-image
>> --
>> 2.48.1
>>
>>
> Looks good to me, thanks.
> Acked-by: Ales Musil <amu...@redhat.com>
>
Thanks, Ales! Applied to main.
Regards,
Dumitru
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
