mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 17:50:20 +00:00
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 <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio
Megan Wilhite
parent
c33977f96f
commit
88365fb69e
25 changed files with 30 additions and 25 deletions
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/common.in
|
||||
etcd3-py==0.1.6 ; python_version >= "3.6"
|
||||
# via -r requirements/static/ci/common.in
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
etcd3-py==0.1.6 ; python_version >= "3.6"
|
||||
# via -r requirements/static/ci/common.in
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/common.in
|
||||
etcd3-py==0.1.6 ; python_version >= "3.6"
|
||||
# via -r requirements/static/ci/common.in
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
etcd3-py==0.1.6 ; python_version >= "3.6"
|
||||
# via -r requirements/static/ci/common.in
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/common.in
|
||||
etcd3-py==0.1.6 ; python_version >= "3.6"
|
||||
# via -r requirements/static/ci/common.in
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
etcd3-py==0.1.6 ; python_version >= "3.6"
|
||||
# via -r requirements/static/ci/common.in
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/common.in
|
||||
etcd3-py==0.1.6 ; python_version >= "3.6"
|
||||
# via -r requirements/static/ci/common.in
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
# pytest-salt-factories
|
||||
|
|
|
|||
|
|
@ -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/static/ci/common.in
|
||||
etcd3-py==0.1.6 ; python_version >= "3.6"
|
||||
# via -r requirements/static/ci/common.in
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue