Hi Chris and all, +1 for this using a placeholder (@STRATOS_VERSION_TOKEN@) in place of the hard coded version strings and using maven to create the installable archives.
On Fri, Jul 11, 2014 at 11:54 AM, chris snow <chsnow...@gmail.com> wrote: > Hi Devs, > > Does anyone have any concerns with us making the changes listed in the > previous email? > > Note that we are also proposing to change the hard coded version string in > files in the tools folder with a token, e.g. @STRATOS_VERSION_TOKEN@. > This token will be replaced with the stratos version (e.g. 4.1.0-SNAPSHOT) > when zip archives are created of the tools folder with 'mvn install'. > > This will mean that when you are installing stratos, puppet master or > puppet agent, you will not work directly with the files/scripts in the > tools folder in your checked out git repo. Instead you will need to unzip > one of these archives to access those files/scripts: > > 'apache-stratos-puppet-master-files-x.y.z.zip' > 'apache-stratos-puppet-cartridge-files-x.y.z.zip' > 'apache-stratos-installer-files-x.y.z.zip' > > Many thanks, > Chris > On 9 Jul 2014 08:51, "chris snow" <chsnow...@gmail.com> wrote: > >> Hi Isuru, >> >> Separating the repository will just move the problem (of having to >> manually update these files) rather than fix it? I think we could fix >> this problem as we are implement STRATOS-680. >> >> The purpose of STRATOS-680 is to create zip archives of files in the >> tool directory. If we had a @VERSION_TOKEN@ in these files, the maven >> goal for creating the zip archive could execute the maven replace >> plugin to replace these tokens before zipping them? Users would use >> installer scripts extracted from the zip files when installing stratos >> so the tokens would be replaced with the correct version. >> >> The proposed changes are: >> >> 1) Rename /tools/puppet3 to /tools/puppet3-master to make it clear >> that these scripts are for setting up a puppet master >> 2) Rename /tools/puppet3-agent to /tools/puppet3-cartridge to make it >> clear that these scripts are for setting up a cartridge >> 3) 'mvn install' to create an archive: >> 'apache-stratos-puppet-master-files-x.y.z.zip' containing: >> /tools/puppet3-master/* >> 4) 'mvn install' to create an archive: >> 'apache-stratos-puppet-cartridge-files-x.y.z.zip' containing: >> /tools/puppet3-cartridge/* >> 5) 'mvn install' to create an archive: >> 'apache-stratos-installer-files-x.y.z.zip' containing: >> /tools/stratos-installer/* >> >> In summary, the archives created in 3,4 and 5 would have the tokens >> replaced using the maven replacer plugin. The Stratos release process >> would NOT need to change these tokens. >> >> WDYT? >> >> Many thanks, >> >> Chris >> >> On Tue, Jul 8, 2014 at 9:54 PM, Isuru Perera <isu...@wso2.com> wrote: >> > Hi, >> > >> > It's not easy to do a release when we have all files together. >> > >> > We need to keep the main repository for Java code only. Then we can >> easily >> > use the maven release plugin. Now the release managers cannot fully >> utilize >> > Maven release plugin as they need to update the puppet files & >> installers >> > before creating the release tag. This is an extremely difficult task >> and we >> > should stop doing that immediately. >> > >> > By having separate repositories for puppet & installer, we can release >> those >> > separately. Also these proposed repositories will be tightly coupled to >> the >> > version. IMO, that's okay as we can create tags for a version. >> > >> > For example, jclouds also has multiple repositories: >> > https://github.com/jclouds and they release each repository using a >> common >> > version. >> > https://github.com/jclouds/jclouds/releases >> > https://github.com/jclouds/jclouds-cli/releases >> > >> > I hope this is clear. May be we can start a different thread on this. >> > >> > Thanks! >> > >> > Best Regards, >> > >> > >> > On Tue, Jul 8, 2014 at 11:18 AM, chris snow <chsnow...@gmail.com> >> wrote: >> >> >> >> Hi Isuru, >> >> >> >> I don't really have a view on this at the moment. What would you say >> >> are the pros and cons of splitting out the puppet files and the >> >> installer from the main source tree? >> >> >> >> Would you suggest puppet files and installer are each in a separate >> >> git repos, or both together? Would these repos need to mirror the >> >> main stratos git repo? For example, if installer is fairly tightly >> >> coupled to stratos version? >> >> >> >> Many thanks, >> >> >> >> Chris >> >> >> >> On Tue, Jul 8, 2014 at 7:41 AM, Isuru Perera <isu...@wso2.com> wrote: >> >> > Can we have separate git repos for Puppet files and installer? >> >> > >> >> > >> >> > On Mon, Jul 7, 2014 at 7:44 PM, Nirmal Fernando < >> nirmal070...@gmail.com> >> >> > wrote: >> >> >> >> >> >> >> >> >> >> >> >> >> >> >> On Sun, Jul 6, 2014 at 6:36 AM, Dakshika Jayathilaka >> >> >> <daksh...@wso2.com> >> >> >> wrote: >> >> >>> >> >> >>> Hi, >> >> >>> >> >> >>> Before we fix $subject[1] we need to have proper discussion on >> >> >>> $subject. >> >> >>> This comes to live due to initial email discussion[2] [3].Chris >> >> >>> proposed >> >> >>> some of the suggestions as below. >> >> >>> >> >> >>> Proposed changes: >> >> >>> >> >> >>> 1) Rename /tools/puppet3 to /tools/puppet3-master to make it clear >> >> >>> that >> >> >>> these scripts are for setting up a puppet master >> >> >> >> >> >> >> >> >> +1 >> >> >>> >> >> >>> 2) Rename /tools/puppet3-agent to /tools/puppet3-cartridge to make >> it >> >> >>> clear that these scripts are for setting up a cartridge >> >> >> >> >> >> Do we only have Cartridges there? >> >> >> >> >> >>> >> >> >>> 3) 'mvn install' to create an archive: >> >> >>> 'apache-stratos-puppet-master-files-x.y.z.zip' containing: >> >> >>> /tools/puppet3-master/* >> >> >> >> >> >> >> >> >> +1 >> >> >>> >> >> >>> 4) 'mvn install' to create an archive: >> >> >>> 'apache-stratos-puppet-cartridge-files-x.y.z.zip' containing: >> >> >>> /tools/puppet3-cartridge/* >> >> >>> 5) 'mvn install' to create an archive: >> >> >>> 'apache-stratos-installer-script-x.y.z.zip' containing: >> >> >>> /tools/stratos-installer/* >> >> >>> >> >> >>> Not only the above we need to have plan on easing current >> installation >> >> >>> process without confusing end users. >> >> >> >> >> >> >> >> >> Yes, let's improve together :-) >> >> >> >> >> >>> >> >> >>> >> >> >>> WDYT? >> >> >>> >> >> >>> >> >> >>> >> >> >>> [1] https://issues.apache.org/jira/browse/STRATOS-680 >> >> >>> [2] >> >> >>> >> >> >>> >> http://mail-archives.apache.org/mod_mbox/stratos-dev/201406.mbox/%3c1403201712.9117.yahoomail...@web163902.mail.gq1.yahoo.com%3E >> >> >>> >> >> >>> [3] >> >> >>> >> >> >>> >> http://mail-archives.apache.org/mod_mbox/incubator-stratos-dev/201406.mbox/%3CCAFiLh_4PuTrSKZcMY%3Dw7zDacnyUwvVb%3DGK%2Bm7FDZqrF3z0KO%3DA%40mail.gmail.com%3E >> >> >>> >> >> >>> Regards, >> >> >>> >> >> >>> Dakshika Jayathilaka >> >> >>> Software Engineer >> >> >>> WSO2, Inc. >> >> >>> lean.enterprise.middleware >> >> >>> 0771100911 >> >> >> >> >> >> >> >> >> >> >> >> >> >> >> -- >> >> >> Best Regards, >> >> >> Nirmal >> >> >> >> >> >> Nirmal Fernando. >> >> >> PPMC Member & Committer of Apache Stratos, >> >> >> Senior Software Engineer, WSO2 Inc. >> >> >> >> >> >> Blog: http://nirmalfdo.blogspot.com/ >> >> > >> >> > >> >> > >> >> > >> >> > -- >> >> > Isuru Perera >> >> > Senior Software Engineer | WSO2, Inc. | http://wso2.com/ >> >> > Lean . Enterprise . Middleware >> >> > >> >> > about.me/chrishantha >> > >> > >> > >> > >> > -- >> > Isuru Perera >> > Senior Software Engineer | WSO2, Inc. | http://wso2.com/ >> > Lean . Enterprise . Middleware >> > >> > about.me/chrishantha >> >> -- >> <http://about.me/chrishantha> >> Thanks and Regards, >> >> Isuru H. >> <http://about.me/chrishantha> >> +94 716 358 048 <http://about.me/chrishantha>* <http://wso2.com/>* >> >> >> * <http://wso2.com/>* >> >> >>
