Commit fd7fb7f9 authored by Alex Giurgiu's avatar Alex Giurgiu Committed by GitHub

Merge pull request #23 from microservices-demo/rename-to-carts

Rename to carts
parents 39963b86 829aa66f
......@@ -7,7 +7,7 @@ jdk:
install: true
env:
- GROUP=weaveworksdemos COMMIT=$TRAVIS_COMMIT TAG=$TRAVIS_TAG REPO=cart;
- GROUP=weaveworksdemos COMMIT=$TRAVIS_COMMIT TAG=$TRAVIS_TAG REPO=carts;
script:
- set -e
......
......@@ -26,7 +26,7 @@ CODE_DIR=$(cd $SCRIPT_DIR/..; pwd)
echo $CODE_DIR
$DOCKER_CMD run --rm -v $HOME/.m2:/root/.m2 -v $CODE_DIR:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn -q -DskipTests package
cp $CODE_DIR/target/*.jar $CODE_DIR/docker/cart
cp $CODE_DIR/target/*.jar $CODE_DIR/docker/carts
for m in ./docker/*/; do
REPO=${GROUP}/$(basename $m)
......
......@@ -11,7 +11,7 @@ from util.Dredd import Dredd
class CartContainerTest(unittest.TestCase):
TAG = "latest"
COMMIT = ""
container_name = Docker().random_container_name('cart')
container_name = Docker().random_container_name('carts')
mongo_container_name = Docker().random_container_name('cart-db')
def __init__(self, methodName='runTest'):
super(CartContainerTest, self).__init__(methodName)
......@@ -22,10 +22,10 @@ class CartContainerTest(unittest.TestCase):
command = ['docker', 'run',
'-d',
'--name', CartContainerTest.container_name,
'-h', 'cart',
'-h', 'carts',
'--link',
CartContainerTest.mongo_container_name,
'weaveworksdemos/cart:' + self.COMMIT]
'weaveworksdemos/carts:' + self.COMMIT]
Docker().execute(command)
self.ip = Docker().get_container_ip(CartContainerTest.container_name)
......@@ -42,7 +42,7 @@ class CartContainerTest(unittest.TestCase):
sleep(1)
out = Dredd().test_against_endpoint(
"cart", "http://cart/",
"carts", "http://carts/",
links=[self.mongo_container_name, self.container_name],
env=[("MONGO_ENDPOINT", "mongodb://cart-db:27017/data")],
dump_streams=True)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment