From 4fd25353fb7dc60630a34445ab5632a197383a5d Mon Sep 17 00:00:00 2001
From: Christophe Lyon <christophe.lyon@linaro.org>
Date: Thu, 30 Mar 2017 12:42:56 +0000
Subject: Revert "start-container-docker.sh: Add --memory option."

This reverts commit 8dd72d26d0a1865bdeacb179fedf96324f22eba3.

Change-Id: Ic0fce2125b74b98789e9048d74135f3215b87a26
---
 start-container-docker.sh  | 11 ++---------
 start-container-none.sh    |  8 +-------
 start-container-schroot.sh |  8 +-------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/start-container-docker.sh b/start-container-docker.sh
index b106e80d..8d26cffb 100755
--- a/start-container-docker.sh
+++ b/start-container-docker.sh
@@ -16,7 +16,7 @@ set -e
 #   and returns shell statements to export the related variables. In
 #   this case, it also defines ${SSH_AGENT_CLEANUP}.
 usage() {
-    echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}] [--memory XXXX]"
+    echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}]"
     echo
     echo "  container-arch: architecture (eg: amd64, i386, arm64, armhf)"
     echo "  distro: distribution (eg: trusty)"
@@ -24,7 +24,6 @@ usage() {
     echo "    useful if the name resolution does not work correctly"
     echo "  session-name: session, in case the default '$BUILD_NUMBER-$JOB_NAME' is not suitable"
     echo "  task: type of container (build or test, default=build)"
-    echo "  memory: limit memory usage to XXXX MB, defaults to 7500"
     exit 1
 }
 
@@ -39,7 +38,6 @@ distro=
 session_host=
 session_name=
 task="build"
-memory=7500
 
 while [ $# -ge 1 ]
 do
@@ -69,11 +67,6 @@ do
 	    [ x${task} = x ] && usage
 	    shift 2
 	    ;;
-	--memory)
-	    memory=$2
-	    [ x${memory} = x ] && usage
-	    shift 2
-	    ;;
 	*)
 	    echo "Unsupported option: $1"
 	    usage
@@ -131,7 +124,7 @@ session_id=$($DOCKER run --name $session_name -dtP \
 		 -v $HOME/snapshots-ref:$HOME/snapshots-ref:ro \
 		 -v $WORKSPACE:$WORKSPACE \
 		 ${SECURITY} \
-		 --memory=${memory}M --pids-limit=5000 \
+		 --memory=7500M --pids-limit=5000 \
 		 $image)
 
 if [ x"$session_id" = x ]; then
diff --git a/start-container-none.sh b/start-container-none.sh
index 304f3a4b..0c55e08e 100755
--- a/start-container-none.sh
+++ b/start-container-none.sh
@@ -16,7 +16,7 @@ set -e
 # - definition of ${session_host} and ${session_port}, can be used for
 #   a remote connexion to the container
 usage() {
-    echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}] [--memory XXXX]"
+    echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}]"
     echo
     echo "  container-arch: architecture (eg: amd64, i386, arm64, armhf)"
     echo "  distro: distribution (eg: trusty)"
@@ -24,7 +24,6 @@ usage() {
     echo "    useful if the name resolution does not work correctly"
     echo "  session-name: session, in case the default '$BUILD_NUMBER-$JOB_NAME' is not suitable"
     echo "  task: type of container (build or test, default=build)"
-    echo "  memory: ignored"
     exit 1
 }
 
@@ -68,11 +67,6 @@ do
 	    [ x${task} = x ] && usage
 	    shift 2
 	    ;;
-	--memory)
-	    memory=$2
-	    [ x${memory} = x ] && usage
-	    shift 2
-	    ;;
 	*)
 	    echo "Unsupported option: $1"
 	    usage
diff --git a/start-container-schroot.sh b/start-container-schroot.sh
index b9419e0d..b9bacd88 100755
--- a/start-container-schroot.sh
+++ b/start-container-schroot.sh
@@ -13,7 +13,7 @@ set -e
 # - definition of ${session_host} and ${session_port}, can be used for
 #   a remote connexion to the container
 usage() {
-    echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}] [--memory XXXX]"
+    echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}]"
     echo
     echo "  container-arch: architecture (eg: amd64, i386, arm64, armhf)"
     echo "  distro: distribution (eg: trusty)"
@@ -21,7 +21,6 @@ usage() {
     echo "    useful if the name resolution does not work correctly"
     echo "  session-name: session, in case the default '$BUILD_NUMBER-$JOB_NAME' is not suitable"
     echo "  task: type of container (build or test, default=build)"
-    echo "  memory: ignored"
     exit 1
 }
 
@@ -65,11 +64,6 @@ do
 	    [ x${task} = x ] && usage
 	    shift 2
 	    ;;
-	--memory)
-	    memory=$2
-	    [ x${memory} = x ] && usage
-	    shift 2
-	    ;;
 	*)
 	    echo "Unsupported option: $1"
 	    usage
-- 
cgit v1.2.3