Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 983d51ded -> 904245219
updating the deployment scripts Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d212c2cd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d212c2cd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d212c2cd Branch: refs/heads/4.0.0-grouping Commit: d212c2cd1b08bb1e06c8b608198aa99a2072c63b Parents: c80c05d Author: reka <[email protected]> Authored: Mon Oct 13 15:16:47 2014 +0530 Committer: reka <[email protected]> Committed: Mon Oct 13 15:16:47 2014 +0530 ---------------------------------------------------------------------- .../deployment_script.sh | 3 ++- .../samples/ec2/group1.json | 2 +- .../samples/ec2/group2.json | 2 +- .../samples/ec2/m2_single_subsciption_app.json | 26 ++++++-------------- tools/test.json | 0 5 files changed, 11 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d212c2cd/tools/automation-sripts/grouping-automation-script/deployment_script.sh ---------------------------------------------------------------------- diff --git a/tools/automation-sripts/grouping-automation-script/deployment_script.sh b/tools/automation-sripts/grouping-automation-script/deployment_script.sh index 79c039d..a0740cf 100755 --- a/tools/automation-sripts/grouping-automation-script/deployment_script.sh +++ b/tools/automation-sripts/grouping-automation-script/deployment_script.sh @@ -20,7 +20,8 @@ curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/tomcat.json' - sleep 5 -curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/mytest.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/cartridge/definition +curl -X POST -H "Content-Type: application/json" -d @'samples/ec2/tomcat1.json' -k -v -u admin:admin https://localhost:9443/stratos/admin/cartridge/definition + sleep 5 http://git-wip-us.apache.org/repos/asf/stratos/blob/d212c2cd/tools/automation-sripts/grouping-automation-script/samples/ec2/group1.json ---------------------------------------------------------------------- diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/group1.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/group1.json index 4be9ea5..dc8eded 100755 --- a/tools/automation-sripts/grouping-automation-script/samples/ec2/group1.json +++ b/tools/automation-sripts/grouping-automation-script/samples/ec2/group1.json @@ -1,7 +1,7 @@ { "name": "group1", "cartridges": [ - "mytest","tomcat" + "tomcat1","tomcat" ], "dependencies": { "killBehaviour": "kill-none" http://git-wip-us.apache.org/repos/asf/stratos/blob/d212c2cd/tools/automation-sripts/grouping-automation-script/samples/ec2/group2.json ---------------------------------------------------------------------- diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/group2.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/group2.json index 9e27497..942ef8b 100755 --- a/tools/automation-sripts/grouping-automation-script/samples/ec2/group2.json +++ b/tools/automation-sripts/grouping-automation-script/samples/ec2/group2.json @@ -4,7 +4,7 @@ "group1" ], "cartridges": [ - "tomcat","mytest" + "tomcat" ], "dependencies": { "startupOrders": [ http://git-wip-us.apache.org/repos/asf/stratos/blob/d212c2cd/tools/automation-sripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json ---------------------------------------------------------------------- diff --git a/tools/automation-sripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json b/tools/automation-sripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json index 852da91..b234c49 100644 --- a/tools/automation-sripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json +++ b/tools/automation-sripts/grouping-automation-script/samples/ec2/m2_single_subsciption_app.json @@ -1,6 +1,6 @@ { "applicationId": "test_app_3", - "alias": "mytestapp2", + "alias": "phpapp2", "components": { "groups": [ { @@ -13,11 +13,6 @@ "type": "tomcat", "alias": "mygroup2tomcat" - }, - { - "type": "mytest", - "alias": "mygroup2mytest" - } ], "subGroups": [ @@ -41,8 +36,8 @@ }, { - "type": "mytest", - "alias": "mygroup1mytest" + "type": "tomcat1", + "alias": "mygroup1tomcat1" } @@ -90,18 +85,11 @@ "repoPassword": "yyyy" }, { - "alias": "mygroup1mytest", + "alias": "mygroup1tomcat1", "deploymentPolicy": "deployment_policy_1", "autoscalingPolicy": "autoscale_policy_1" - }, - { - "alias": "mygroup2mytest", - "deploymentPolicy": "deployment_policy_1", - "autoscalingPolicy": "autoscale_policy_1", - "repoURL": "www.mygit.com/php.git", - "privateRepo": "true", - "repoUsername": "admin", - "repoPassword": "xxxx" } - ] + + ] } + http://git-wip-us.apache.org/repos/asf/stratos/blob/d212c2cd/tools/test.json ---------------------------------------------------------------------- diff --git a/tools/test.json b/tools/test.json deleted file mode 100644 index e69de29..0000000
