From 519666b0cf052d47210199b3ecfdd610884e09d7 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 24 Sep 2023 18:35:35 +0100 Subject: [PATCH] Set `cgroupns` to `host` to fix the libvirt migration tests. This needs a newer version of the python docker package. The breakage was due to updating the docker container used. - https://github.com/saltstack/salt-ci-containers/pull/42 Signed-off-by: Pedro Algarvio --- requirements/static/ci/py3.10/cloud.txt | 2 +- requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/lint.txt | 4 +++- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.10/pkgtests.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.7/cloud.txt | 2 +- requirements/static/ci/py3.7/freebsd.txt | 2 +- requirements/static/ci/py3.7/lint.txt | 4 +++- requirements/static/ci/py3.7/linux.txt | 2 +- requirements/static/ci/py3.7/windows.txt | 2 +- requirements/static/ci/py3.8/cloud.txt | 2 +- requirements/static/ci/py3.8/freebsd.txt | 2 +- requirements/static/ci/py3.8/lint.txt | 4 +++- requirements/static/ci/py3.8/linux.txt | 2 +- requirements/static/ci/py3.8/windows.txt | 2 +- requirements/static/ci/py3.9/cloud.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/lint.txt | 4 +++- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 2 +- tests/filename_map.yml | 3 +++ tests/pytests/integration/modules/test_virt.py | 6 ++++-- 25 files changed, 38 insertions(+), 25 deletions(-) diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 7c163da4e736..d4ca8ed71a7e 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -410,7 +410,7 @@ dnspython==2.1.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 8330d4371bb6..01017fab80ba 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -408,7 +408,7 @@ dnspython==1.16.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 3e47effb506f..c72196a02ce5 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -407,7 +407,7 @@ dnspython==1.16.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index f51539e63254..ad935c518330 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -411,7 +411,7 @@ dnspython==2.1.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/static/ci/lint.in etcd3-py==0.1.6 # via -r requirements/static/ci/common.in @@ -626,6 +626,7 @@ packaging==21.3 # via # -r requirements/base.txt # ansible-core + # docker paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via # -r requirements/static/ci/common.in @@ -832,6 +833,7 @@ tzlocal==3.0 urllib3==1.26.6 # via # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 7349ba54f9aa..0d94d7ca1312 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -421,7 +421,7 @@ dnspython==1.16.0 # via # -r requirements/static/ci/common.in # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/pkgtests.txt b/requirements/static/ci/py3.10/pkgtests.txt index b4edd89f075d..f3a0fb6e920e 100644 --- a/requirements/static/ci/py3.10/pkgtests.txt +++ b/requirements/static/ci/py3.10/pkgtests.txt @@ -29,7 +29,7 @@ distro==1.8.0 # via # -r requirements/base.txt # pytest-skip-markers -docker==6.1.2 +docker==6.1.3 # via -r requirements/static/ci/pkgtests.in exceptiongroup==1.1.0 # via pytest diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 7832f069135e..07890198754d 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -93,7 +93,7 @@ dnspython==1.16.0 # python-etcd docker-pycreds==0.4.0 # via docker -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index a95dcd8423e9..96e249072404 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -418,7 +418,7 @@ dnspython==2.1.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index fd53d8d40eb3..994071661dda 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -415,7 +415,7 @@ dnspython==1.16.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt index 0f5f9a68dbc8..058d691f3ae9 100644 --- a/requirements/static/ci/py3.7/lint.txt +++ b/requirements/static/ci/py3.7/lint.txt @@ -421,7 +421,7 @@ dnspython==2.1.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/static/ci/lint.in etcd3-py==0.1.6 # via -r requirements/static/ci/common.in @@ -666,6 +666,7 @@ packaging==21.3 # via # -r requirements/base.txt # ansible-core + # docker paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via # -r requirements/static/ci/common.in @@ -899,6 +900,7 @@ tzlocal==3.0 urllib3==1.26.6 # via # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index a503a796b2f7..65673efa1cee 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -429,7 +429,7 @@ dnspython==1.16.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 528cb3b33c48..f3bb6f81b76e 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -99,7 +99,7 @@ dnspython==1.16.0 # python-etcd docker-pycreds==0.4.0 # via docker -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 1508fcaeb115..36c49e0d1e1e 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -416,7 +416,7 @@ dnspython==2.1.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index cce95353bcde..d3c58aebb4b9 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -413,7 +413,7 @@ dnspython==1.16.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index 0db567743fa0..f3f999e9cae6 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -419,7 +419,7 @@ dnspython==2.1.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/static/ci/lint.in etcd3-py==0.1.6 # via -r requirements/static/ci/common.in @@ -657,6 +657,7 @@ packaging==21.3 # via # -r requirements/base.txt # ansible-core + # docker paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via # -r requirements/static/ci/common.in @@ -880,6 +881,7 @@ tzlocal==3.0 urllib3==1.26.6 # via # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index f5994b934b79..45b3fd209f76 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -427,7 +427,7 @@ dnspython==1.16.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 049eec81923a..1395df92b12f 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -95,7 +95,7 @@ dnspython==1.16.0 # python-etcd docker-pycreds==0.4.0 # via docker -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index f35e22b3d2dd..d46f313b2a3c 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -416,7 +416,7 @@ dnspython==2.1.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index bb87f5f38007..cfe07474d19c 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -414,7 +414,7 @@ dnspython==1.16.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 3d9814024f38..f5e760e47297 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -413,7 +413,7 @@ dnspython==1.16.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 52ac26f06633..4ec4d0a3a567 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -417,7 +417,7 @@ dnspython==2.1.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/static/ci/lint.in etcd3-py==0.1.6 # via -r requirements/static/ci/common.in @@ -655,6 +655,7 @@ packaging==21.3 # via # -r requirements/base.txt # ansible-core + # docker paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin" # via # -r requirements/static/ci/common.in @@ -881,6 +882,7 @@ tzlocal==3.0 urllib3==1.26.6 # via # botocore + # docker # kubernetes # python-etcd # requests diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index d67283f098ce..271608f37bda 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -429,7 +429,7 @@ dnspython==1.16.0 # -r requirements/static/ci/common.in # ciscoconfparse # python-etcd -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 4eca605cb594..6df83b3a1b08 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -95,7 +95,7 @@ dnspython==1.16.0 # python-etcd docker-pycreds==0.4.0 # via docker -docker==6.1.2 +docker==6.1.3 # via -r requirements/pytest.txt etcd3-py==0.1.6 # via -r requirements/static/ci/common.in diff --git a/tests/filename_map.yml b/tests/filename_map.yml index 6e5da60df433..ded66d324101 100644 --- a/tests/filename_map.yml +++ b/tests/filename_map.yml @@ -323,6 +323,9 @@ salt/(minion\.py|channel/.+|transport/.+): tests/support/mock.py: - unit.test_mock +tests/support/virt.py: + - pytests.integration.modules.test_virt + tests/support/pytest/mysql.py: - pytests.functional.states.test_mysql - pytests.functional.modules.test_mysql diff --git a/tests/pytests/integration/modules/test_virt.py b/tests/pytests/integration/modules/test_virt.py index 57ec239c4e91..571335be719a 100644 --- a/tests/pytests/integration/modules/test_virt.py +++ b/tests/pytests/integration/modules/test_virt.py @@ -66,7 +66,8 @@ def virt_minion_0( "extra_hosts": { virt_minion_0_id: "127.0.0.1", virt_minion_1_id: "127.0.0.1", - } + }, + "cgroupns": "host", }, pull_before_start=True, skip_on_pull_failure=True, @@ -103,7 +104,8 @@ def virt_minion_1( "extra_hosts": { virt_minion_0_id: "127.0.0.1", virt_minion_1_id: "127.0.0.1", - } + }, + "cgroupns": "host", }, pull_before_start=True, skip_on_pull_failure=True,