diff --git a/Berksfile b/Berksfile index 5125a6a..73389d2 100644 --- a/Berksfile +++ b/Berksfile @@ -14,5 +14,5 @@ cookbook 'windows', git: "https://github.com/opscode-cookbooks/windows.git", ref cookbook 'java', git: "https://github.com/opscode-cookbooks/java.git", ref: "7b559d6509c32cb250571250a2484dba2a9d5e49" -cookbook "cookbook-qubell-tomcat", git: "https://github.com/qubell-bazaar/cookbook-qubell-tomcat.git", ref: "ac98a7e709aa8dd5b7c8a2a102289c7239fe5b96" -cookbook "cookbook-qubell-build", git: "https://github.com/qubell-bazaar/cookbook-qubell-build.git", ref: "59889592b5d2a8a6e3d02ca4814f07961f4de22d" +cookbook "cookbook-qubell-tomcat", git: "https://github.com/qubell-bazaar/cookbook-qubell-tomcat.git", ref: "v0.3.0" +cookbook "cookbook-qubell-build", git: "https://github.com/qubell-bazaar/cookbook-qubell-build.git", ref: "v0.3.0" diff --git a/component-tomcat-dev.yml b/component-tomcat-dev.yml index 1991a74..ed70043 100644 --- a/component-tomcat-dev.yml +++ b/component-tomcat-dev.yml @@ -78,7 +78,7 @@ application: name: Cookbooks URL actions: build-app: - type: receive-command(string scm-provider, string git-uri, string app-branch => list wars) + type: receive-command(string git-uri, string app-branch => list wars) name: Maven build deploy-libs: type: receive-command(list lib-uri) @@ -150,7 +150,6 @@ application: recipeUrl: "{$.recipe-url}" jattrs: scm: - provider: "{$.scm-provider}" repository: "{$.git-uri}" revision: "{$.app-branch}" output: diff --git a/test/test.py b/test/test.py index bf4d393..3368ff3 100644 --- a/test/test.py +++ b/test/test.py @@ -67,6 +67,6 @@ def test_port(self, instance, hosts, port): assert result == 0 @instance(byApplication=name) - @workflow("tomcat.build-app", {"scm-provider": "git", "git-uri": "git://github.com/qubell/starter-java-web.git", "app-branch": "HEAD"}) + @workflow("tomcat.build-app", {"git-uri": "git://github.com/qubell/starter-java-web.git", "app-branch": "HEAD"}) def test_build(self, instance): assert True