diff --git a/.gitattributes b/.gitattributes index 985f3647b9e3c390e8d0a3457a182f99eb9f2f00..bd6e2f01ab9d97fa567a41662d9bb720e04bd474 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5475,6 +5475,7 @@ SubSystems/Online_Cobalt/test/tgenerateStationStreams.sh eol=lf SubSystems/Online_Cobalt/test/tstartBGL.in_parset -text SubSystems/Online_Cobalt/test/tstartBGL.run eol=lf SubSystems/Online_Cobalt/test/tstartBGL.sh eol=lf +SubSystems/Online_Cobalt/validation/cep4/docker/cgroupdriver.test -text SubSystems/Online_Cobalt/validation/cluster/c3/cexec -text SubSystems/Online_Cobalt/validation/cluster/connectivity/cobalt2cep.test eol=lf SubSystems/Online_Cobalt/validation/cluster/connectivity/cobalt2cobalt.test eol=lf diff --git a/SubSystems/Online_Cobalt/validation/cep4/docker/cgroupdriver.test b/SubSystems/Online_Cobalt/validation/cep4/docker/cgroupdriver.test new file mode 100755 index 0000000000000000000000000000000000000000..19a0650dbd8f45ffdc0ae8ea0e12c0936d2c03ea --- /dev/null +++ b/SubSystems/Online_Cobalt/validation/cep4/docker/cgroupdriver.test @@ -0,0 +1,11 @@ +#/bin/bash -e + +# Test for cgroupdriver=cgroupfs workaround for Docker 1.9.1 + +DOCKER_VERSION=`docker --version | awk '{ print $3; }'` + +[ "$DOCKER_VERSION" == "1.9.1," ] || exit 0 + +# Docker startup line must contain "--exec-opt=native.cgroupdriver=cgroupfs" +fgrep -q "ExecStart" /usr/lib/systemd/system/docker.service | fgrep -q "--exec-opt=native.cgroupdriver=cgroupfs" +