diff options
| author |   mbeierl <mark.beierl@dell.com> | 2017-08-31 19:57:31 -0400 |
|---|---|---|
| committer | mbeierl <mark.beierl@dell.com> | 2017-09-01 10:29:42 -0400 |
| commit | 7ef0242a48088ba9038873f8d92992957d1b2b77 (patch) | |
| tree | 115269f956b4fe4828f371bd869bd2e20718965c /ci | |
| parent | 21644ee3689be254791809c791a18fcce7495aa1 (diff) | |
Re-instating docker build verify
Change-Id: I720ba0c8e413d5c61e8d6f9a13eae0441df53ccb
Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/remove_docker_container.sh | 2 | ||||
| -rwxr-xr-x | ci/verify-build.sh | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ci/remove_docker_container.sh b/ci/remove_docker_container.sh index 1764034..297b14f 100755 --- a/ci/remove_docker_container.sh +++ b/ci/remove_docker_container.sh @@ -19,7 +19,7 @@ export CARBON_DIR=${ci}/job/carbon/ docker-compose -f local-docker-compose.yaml down -for container_name in storperf storperf-master storperf-swaggerui storperf-httpfrontend storperf-reporting +for container_name in storperf storperf-master storperf-swaggerui storperf-httpfrontend storperf-reporting storperf-graphite do container=`docker ps -a -q -f name=$container_name` if [ ! -z $container ] diff --git a/ci/verify-build.sh b/ci/verify-build.sh index 0139845..9911566 100755 --- a/ci/verify-build.sh +++ b/ci/verify-build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -xe ############################################################################## # Copyright (c) 2017 Dell EMC and others. # @@ -11,22 +11,24 @@ cd `dirname $0` ci=`pwd` -exit 0 - cd ${ci}/../docker export ENV_FILE=${ci}/job/admin.rc export CARBON_DIR=${ci}/job/carbon/ +${ci}/remove_docker_container.sh + mkdir -p ${CARBON_DIR} touch ${ENV_FILE} if [ -z $ARCH ] then - ARCH=x86_64 + ARCH=$(uname -m) fi -export ARCH +export ARCH=${ARCH} + +echo Using $ARCH architecture docker-compose -f local-docker-compose.yaml down docker-compose -f local-docker-compose.yaml build |