From e0f62511ce6730b3bc727251635182ac5eb76a0e Mon Sep 17 00:00:00 2001 From: "Northard, Robert A" Date: Sat, 11 Mar 2017 00:40:54 +0000 Subject: [PATCH] Added cartridge collection load test to travis. Signed-off-by: Northard, Robert A --- .travis.yml | 3 ++- test/resources/cartridge_collection.json | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 test/resources/cartridge_collection.json diff --git a/.travis.yml b/.travis.yml index c4e070db1..365ddf23d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,11 @@ script: - sleep 30 - ./adop workspace -w Travis create - ./adop project -p TestProject -w Travis create + - ./adop project -p TestProject -w Travis load_collection -c https://raw.githubusercontent.com/Accenture/adop-docker-compose/master/test/resources/cartridge_collection.json - ./adop compose down - docker-compose ${COMPOSE_FILES} build - docker-compose ${COMPOSE_FILES} -p adopdockercompose up -d - count=0; until docker logs adopdockercompose_site_1 | grep "Server running..." &> /dev/null || (( count++ > 12 )); do echo "Waiting $count"; sleep 5; done - - docker logs adopdockercompose_site_1 + - docker logs adopdockercompose_site_1 - docker logs adopdockercompose_site_1 | grep "Server running..." &> /dev/null - curl -sL -w "%{http_code}\\n" "http://localhost/adop-docker-compose/" -o /dev/null | grep "200" &> /dev/null diff --git a/test/resources/cartridge_collection.json b/test/resources/cartridge_collection.json new file mode 100644 index 000000000..ff8e06f8b --- /dev/null +++ b/test/resources/cartridge_collection.json @@ -0,0 +1,14 @@ +{ + "name": "Test_Cartridge_Collection", + "cartridges": [{ + "folder": { + "name": "Skeleton_Cartridge", + "display_name": "Skeleton Cartridge", + "description": "This is the skeleton cartridge" + }, + "cartridge": { + "url": "https://github.com/Accenture/adop-cartridge-skeleton.git", + "desc": "Skeleton Cartridge" + } + }] +}