From e5c09675f3c7c2ecb105df4c4ecf846a2d3ffdc4 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Fri, 7 Aug 2020 11:27:28 +0300 Subject: [PATCH] ipatests: Skip keyring tests on containerized platforms The kernel keyrings are not namespaced yet. Signed-off-by: Stanislav Levin Reviewed-By: Alexander Bokovoy Reviewed-By: Francois Cami --- ipatests/azure/azure-pipelines.yml | 8 ++++---- ipatests/azure/azure_definitions/base-fedora.yml | 2 -- ipatests/test_ipapython/test_keyring.py | 3 +++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ipatests/azure/azure-pipelines.yml b/ipatests/azure/azure-pipelines.yml index ebe0146ac..6e63dd716 100644 --- a/ipatests/azure/azure-pipelines.yml +++ b/ipatests/azure/azure-pipelines.yml @@ -12,7 +12,7 @@ jobs: vmImage: $(VM_IMAGE) container: image: $(DOCKER_BUILD_IMAGE) - options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged + options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged --env container=docker steps: - template: templates/${{ variables.PREPARE_BUILD_TEMPLATE }} - script: | @@ -63,7 +63,7 @@ jobs: vmImage: $(VM_IMAGE) container: image: $(DOCKER_BUILD_IMAGE) - options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged + options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged --env container=docker steps: - template: templates/${{ variables.PREPARE_BUILD_TEMPLATE }} - script: | @@ -88,7 +88,7 @@ jobs: vmImage: $(VM_IMAGE) container: image: $(DOCKER_BUILD_IMAGE) - options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged + options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged --env container=docker steps: - template: templates/${{ variables.PREPARE_BUILD_TEMPLATE }} - task: UsePythonVersion@0 @@ -115,7 +115,7 @@ jobs: vmImage: $(VM_IMAGE) container: image: $(DOCKER_BUILD_IMAGE) - options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged + options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged --env container=docker steps: - template: templates/${{ variables.PREPARE_BUILD_TEMPLATE }} - task: UsePythonVersion@0 diff --git a/ipatests/azure/azure_definitions/base-fedora.yml b/ipatests/azure/azure_definitions/base-fedora.yml index 37c86693d..d9d85840b 100644 --- a/ipatests/azure/azure_definitions/base-fedora.yml +++ b/ipatests/azure/azure_definitions/base-fedora.yml @@ -11,8 +11,6 @@ vms: - test_ipaserver - test_ipatests_plugins - test_xmlrpc/test_dns_plugin.py - ignore: - - test_ipapython/test_keyring.py type: base - container_job: xmlrpc diff --git a/ipatests/test_ipapython/test_keyring.py b/ipatests/test_ipapython/test_keyring.py index dd2237dab..a43962aa7 100644 --- a/ipatests/test_ipapython/test_keyring.py +++ b/ipatests/test_ipapython/test_keyring.py @@ -36,6 +36,9 @@ SIZE_512 = 'abcdefgh' * 64 SIZE_1024 = 'abcdefgh' * 128 +@pytest.mark.skip_if_container( + "any", reason="kernel keyrings are not namespaced yet" +) class test_keyring: """ Test the kernel keyring interface