From d3617e26876bad963afa925620cb85fd6658d77b Mon Sep 17 00:00:00 2001
From: mbeierl <mark.beierl@dell.com>
Date: Fri, 8 Sep 2017 15:29:55 -0400
Subject: Changing Daily to Docker Pull

Changes the daily job to pull images from Docker.io instead
of using docker-compose build to build the image from local
sources.

Reduces the default run time to ~30 minutes unless overridden
in the job definition.

Change-Id: Ib153b66454363f91813dc9c946f6b46156c502bd
JIRA: STORPERF-204
Signed-off-by: mbeierl <mark.beierl@dell.com>
---
 ci/daily.sh                        |  6 +++---
 ci/launch_docker_container.sh      | 16 +++++++++++-----
 docker-compose/docker-compose.yaml |  1 +
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ci/daily.sh b/ci/daily.sh
index 8af8562..51d3fd3 100755
--- a/ci/daily.sh
+++ b/ci/daily.sh
@@ -45,17 +45,17 @@ do
 done < $WORKSPACE/ci/job/admin.rc
 
 export AGENT_COUNT=${AGENT_COUNT:-$CINDER_NODES}
-export BLOCK_SIZES=${BLOCK_SIZES:-1024,16384}
+export BLOCK_SIZES=${BLOCK_SIZES:-16384}
 export STEADY_STATE_SAMPLES=${STEADY_STATE_SAMPLES:-10}
 export DEADLINE=${DEADLINE:-`expr $STEADY_STATE_SAMPLES \* 3`}
 export DISK_TYPE=${DISK_TYPE:-unspecified}
-export QUEUE_DEPTHS=${QUEUE_DEPTHS:-1,4}
+export QUEUE_DEPTHS=${QUEUE_DEPTHS:-4}
 export POD_NAME=${NODE_NAME:-`hostname`}
 export SCENARIO_NAME=${DEPLOY_SCENARIO:-none}
 export TEST_CASE=${TEST_CASE:-snia_steady_state}
 export VERSION=`echo ${BUILD_TAG#*daily-} | cut -d- -f1`
 export VOLUME_SIZE=${VOLUME_SIZE:-2}
-export WORKLOADS=${WORKLOADS:-ws,wr,rs,rr,rw}
+export WORKLOADS=${WORKLOADS:-ws,rs,rw}
 
 echo ==========================================================================
 echo Environment
diff --git a/ci/launch_docker_container.sh b/ci/launch_docker_container.sh
index 949bf9d..2411ce0 100755
--- a/ci/launch_docker_container.sh
+++ b/ci/launch_docker_container.sh
@@ -11,7 +11,7 @@
 cd `dirname $0`
 ci=`pwd`
 
-cd ${ci}/../docker
+cd ${ci}/../docker-compose
 
 export ENV_FILE=${ci}/job/admin.rc
 export CARBON_DIR=${ci}/job/carbon/
@@ -19,18 +19,24 @@ export CARBON_DIR=${ci}/job/carbon/
 if [ ! -d ${ci}/job/carbon ]
 then
     mkdir ${ci}/job/carbon
-    sudo chown 33:33 ${ci}/job/carbon
 fi
 
-if [ -z $ARCH ]
+if [ -z ${ARCH} ]
 then
     ARCH=x86_64
 fi
 
 export ARCH
 
-docker-compose -f local-docker-compose.yaml build
-docker-compose -f local-docker-compose.yaml up -d
+if [ -z ${DOCKER_TAG} ]
+then
+    DOCKER_TAG=latest
+fi
+
+export TAG=${DOCKER_TAG}
+
+docker-compose pull
+docker-compose up -d
 
 echo "Waiting for StorPerf to become active"
 
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 49ab9e2..734fb5b 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -12,6 +12,7 @@ services:
     storperf-master:
         container_name: "storperf-master"
         image: "opnfv/storperf-master:${TAG}"
+        env_file: ${ENV_FILE}
         links:
             - storperf-graphite
 
-- 
cgit 1.2.3-korg