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. - saltstack/salt-ci-containers#42 Signed-off-by: Pedro Algarvio <[email protected]>
s0undt3ch · Sep 24, 2023 · b5f310e · b5f310e
1 parent a8c9147
commit b5f310e
Show file tree

Hide file tree

Showing 25 changed files with 46 additions and 25 deletions.
diff --git 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==5.0.2
+docker==6.1.3
     # via -r requirements/pytest.txt
 etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
@@ -625,6 +625,7 @@ oscrypto==1.2.1
 packaging==21.3
     # via
     #   -r requirements/base.txt
+    #   docker
     #   pytest
 paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
     # via
@@ -854,6 +855,7 @@ typing-extensions==4.2.0
 urllib3==1.26.6
     # via
     #   botocore
+    #   docker
     #   kubernetes
     #   python-etcd
     #   requests

diff --git 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==5.0.3
+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
@@ -407,7 +407,7 @@ dnspython==1.16.0
     # via
     #   -r requirements/static/ci/common.in
     #   python-etcd
-docker==5.0.3
+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
@@ -411,7 +411,7 @@ dnspython==2.1.0
     # via
     #   -r requirements/static/ci/common.in
     #   python-etcd
-docker==5.0.0
+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
@@ -421,7 +421,7 @@ dnspython==1.16.0
     # via
     #   -r requirements/static/ci/common.in
     #   python-etcd
-docker==5.0.3
+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
@@ -29,7 +29,7 @@ distro==1.8.0
     # via
     #   -r requirements/base.txt
     #   pytest-skip-markers
-docker==5.0.3
+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
@@ -93,7 +93,7 @@ dnspython==1.16.0
     #   python-etcd
 docker-pycreds==0.4.0
     # via docker
-docker==2.7.0
+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
@@ -418,7 +418,7 @@ dnspython==2.1.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.2
+docker==6.1.3
     # via -r requirements/pytest.txt
 etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
@@ -665,6 +665,7 @@ oscrypto==1.2.1
 packaging==21.3
     # via
     #   -r requirements/base.txt
+    #   docker
     #   pytest
 paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
     # via
@@ -917,6 +918,7 @@ typing-extensions==3.10.0.0
 urllib3==1.26.6
     # via
     #   botocore
+    #   docker
     #   kubernetes
     #   python-etcd
     #   requests

diff --git 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==5.0.3
+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
@@ -421,7 +421,7 @@ dnspython==2.1.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.0
+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
@@ -429,7 +429,7 @@ dnspython==1.16.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.3
+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
@@ -99,7 +99,7 @@ dnspython==1.16.0
     #   python-etcd
 docker-pycreds==0.4.0
     # via docker
-docker==2.7.0
+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
@@ -416,7 +416,7 @@ dnspython==2.1.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.2
+docker==6.1.3
     # via -r requirements/pytest.txt
 etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
@@ -653,6 +653,7 @@ oscrypto==1.2.1
 packaging==21.3
     # via
     #   -r requirements/base.txt
+    #   docker
     #   pytest
 paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
     # via
@@ -899,6 +900,7 @@ typing-extensions==3.10.0.2
 urllib3==1.26.6
     # via
     #   botocore
+    #   docker
     #   kubernetes
     #   python-etcd
     #   requests

diff --git 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==5.0.3
+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
@@ -419,7 +419,7 @@ dnspython==2.1.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.0
+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
@@ -427,7 +427,7 @@ dnspython==1.16.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.3
+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
@@ -95,7 +95,7 @@ dnspython==1.16.0
     #   python-etcd
 docker-pycreds==0.4.0
     # via docker
-docker==2.7.0
+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
@@ -416,7 +416,7 @@ dnspython==2.1.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.2
+docker==6.1.3
     # via -r requirements/pytest.txt
 etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
@@ -653,6 +653,7 @@ oscrypto==1.2.1
 packaging==21.3
     # via
     #   -r requirements/base.txt
+    #   docker
     #   pytest
 paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
     # via
@@ -902,6 +903,7 @@ typing-extensions==3.10.0.2
 urllib3==1.26.6
     # via
     #   botocore
+    #   docker
     #   kubernetes
     #   python-etcd
     #   requests

diff --git 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==5.0.3
+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
@@ -413,7 +413,7 @@ dnspython==1.16.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.3
+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
@@ -417,7 +417,7 @@ dnspython==2.1.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.0
+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
@@ -429,7 +429,7 @@ dnspython==1.16.0
     #   -r requirements/static/ci/common.in
     #   ciscoconfparse
     #   python-etcd
-docker==5.0.3
+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
@@ -95,7 +95,7 @@ dnspython==1.16.0
     #   python-etcd
 docker-pycreds==0.4.0
     # via docker
-docker==2.7.0
+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
@@ -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
@@ -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,