summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/remove_docker_container.sh2
-rwxr-xr-xci/verify-build.sh12
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