From de2a68b6cbda2ceb22f88577588c496d75302d3c Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 22 Apr 2016 14:05:36 +0000
Subject: [PATCH] Task #9346: Added test for docker 1.9.1 workaround (#9311)
---
.gitattributes | 1 +
.../validation/cep4/docker/cgroupdriver.test | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100755 SubSystems/Online_Cobalt/validation/cep4/docker/cgroupdriver.test
diff --git a/.gitattributes b/.gitattributes
index 985f3647b9e..bd6e2f01ab9 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 00000000000..19a0650dbd8
--- /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"
+
--
GitLab