Fix CI issues
This fixes several CI problems: * Update the DevStack plugin to query for docker's cgroup driver correctly, because the old way suddenly stopped working. * Cap bandit to 1.6.2 to keep it on version supporting py27. Change-Id: I98ecd4dc041b271303ccbb4da61e33fa1a95800b
This commit is contained in:
parent
4480f1e370
commit
24a1c31b8b
|
@ -770,7 +770,7 @@ function run_k8s_kubelet {
|
|||
--root-dir=${KURYR_HYPERKUBE_DATA_DIR}/kubelet"
|
||||
|
||||
if [[ ${CONTAINER_ENGINE} == 'docker' ]]; then
|
||||
command+=" --cgroup-driver $(docker info|awk '/Cgroup/ {print $NF}')"
|
||||
command+=" --cgroup-driver $(docker info -f '{{.CgroupDriver}}')"
|
||||
elif [[ ${CONTAINER_ENGINE} == 'crio' ]]; then
|
||||
local crio_conf
|
||||
crio_conf=/etc/crio/crio.conf
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||
|
||||
bandit>=1.1.0,<=1.6.2 # Apache-2.0
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
ddt>=1.0.1 # MIT
|
||||
docutils>=0.11 # OSI-Approved Open Source, Public Domain
|
||||
|
|
Loading…
Reference in New Issue