Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3006.x] Set cgroupns to host to fix the libvirt migration tests. #65274

Merged
merged 2 commits into from
Sep 24, 2023
Merged

[3006.x] Set cgroupns to host to fix the libvirt migration tests. #65274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3459ab
Bump to `docker==6.1.2`
s0undt3ch Sep 24, 2023
bb9da3b
Set `cgroupns` to `host` to fix the libvirt migration tests.
s0undt3ch Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.10/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -854,6 +855,7 @@ typing-extensions==4.2.0
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.10/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -832,6 +833,7 @@ tzlocal==3.0
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/pkgtests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.7/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -917,6 +918,7 @@ typing-extensions==3.10.0.0
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.7/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -899,6 +900,7 @@ tzlocal==3.0
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.7/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.8/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -899,6 +900,7 @@ typing-extensions==3.10.0.2
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.8/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -880,6 +881,7 @@ tzlocal==3.0
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.8/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.9/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -902,6 +903,7 @@ typing-extensions==3.10.0.2
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion requirements/static/ci/py3.9/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -881,6 +882,7 @@ tzlocal==3.0
urllib3==1.26.6
# via
# botocore
# docker
# kubernetes
# python-etcd
# requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.9/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions tests/filename_map.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions tests/pytests/integration/modules/test_virt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading