Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Added cartridge collection load test to travis. #199

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

@RobertNorthard RobertNorthard May 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anton-kasperovich I think I'll need to split this PR into two, unless I reference another cartridge collection (e.g. DOA) but I don't like this idea as the test should be decoupled. Therefore two PRs;

  1. adding the test cartridge collection JSON
  2. Updating travis file to test collection

I'm not really keen on two PRs really as it means we can't update the test data and tests at the same time and adds additional overhead.

Whats your opinion?

- ./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
14 changes: 14 additions & 0 deletions test/resources/cartridge_collection.json
Original file line number Diff line number Diff line change
@@ -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"
}
}]
}