Need to merge another one also:
commit 915babd970a9b4f209deceb3c4973b7d1c9c0c12
Author: Marcus Sorensen <shadow...@gmail.com>
Date: Wed Sep 26 17:14:57 2012 -0700
fix kvm traffic labels (guest traffic types on multiple networks don't
work)
> -----Original Message-----
> From: Marcus Sorensen [mailto:shadow...@gmail.com]
> Sent: Tuesday, October 16, 2012 10:59 AM
> To: cloudstack-dev@incubator.apache.org
> Cc: Edison Su
> Subject: Re: [VOTE] Apache Cloudstack 4.0.0-incubating Release, second
> round
>
> my vote is -1... got stuck in ErrorInMaintenance. We need to cherry
> pick a5bca0999aa010252b1390c4db6dc5023967ab06 from master.
>
> On Tue, Oct 16, 2012 at 11:42 AM, Rohit Yadav <rohit.ya...@citrix.com>
> wrote:
> > I checked again this time with a fresh devcloud, the commands that
> clean up devcloud's git repo and pulls new code removes dist/ which
> caused issue for Noah. It's fixed in 4.0 now.
> > I think I may have messed up build/override/, so it gave me deploydb
> errors but with fresh devcloud import, no errors all commands work fine.
> >
> > Sorry for the trouble, it works.
> > Regards.
> >
> > ________________________________________
> > From: Edison Su
> > Sent: Tuesday, October 16, 2012 10:51 PM
> > To: Rohit Yadav
> > Cc: cloudstack-dev@incubator.apache.org
> > Subject: RE: [VOTE] Apache Cloudstack 4.0.0-incubating Release,
> second round
> >
> > Why it failed? Any log? The same procedure works for me and chip.
> >
> >> -----Original Message-----
> >> From: Rohit Yadav
> >> Sent: Tuesday, October 16, 2012 10:11 AM
> >> To: Edison Su
> >> Cc: cloudstack-dev@incubator.apache.org
> >> Subject: RE: [VOTE] Apache Cloudstack 4.0.0-incubating Release,
> second
> >> round
> >>
> >> Yes, but the wiki also also suggests to clean DevCloud:
> >> ssh root@localhost -p 2222 'cd /opt/cloudstack/; rm -rf apache-
> tomcat-
> >> 6.0.32; unzip apache-tomcat-6.0.32.zip; cd incubator-cloudstack; git
> >> clean -f; git reset --hard; git pull --rebase; git clean -f; git
> >> checkout origin/4.0 -b 4.0 -f '
> >>
> >> This remove the build/override/templates.sql, so when I do ant
> >> rdeploydb, it fails.
> >>
> >> Regards.
> >> ________________________________________
> >> From: Edison Su
> >> Sent: Tuesday, October 16, 2012 10:20 PM
> >> To: Rohit Yadav
> >> Cc: cloudstack-dev@incubator.apache.org
> >> Subject: Re: [VOTE] Apache Cloudstack 4.0.0-incubating Release,
> second
> >> round
> >>
> >> Rdeploydb will recreate db in devcloud, right? It's documented in
> the
> >> test procedure.
> >>
> >> Sent from my iPhone
> >>
> >> On Oct 16, 2012, at 9:15 AM, "Rohit Yadav" <rohit.ya...@citrix.com>
> >> wrote:
> >>
> >> > Another issue I found was that we're cleaning DevCloud, which
> cleans
> >> the override/templates.sql, pl. make a backup of it. And, pl.
> rdeploydb
> >> to start afresh, your old devcloud image will have old database (3.x)
> >> which will be failed by DatabaseUpgradeChecker upon ant rdebug.
> >> >
> >> > Edison, can we create and public a new devcloud image on the same
> url?
> >> >
> >> > Regards,
> >> > Rohit
> >> >
> >> > On 16-Oct-2012, at 9:41 PM, Rohit Yadav <rohit.ya...@citrix.com>
> >> wrote:
> >> >
> >> >> Okay, I re-read the logs and found the issues:
> >> >>
> >> >> 1. If you're using PPA: natecarlson/maven3, we will have to use
> mvn3,
> >> so mvn3 -P deps. Updated the 4.0 test procedure wiki.
> >> >>
> >> >> 2. Since, we've moved from ant and we clean the repository in
> Test
> >> the Build section. This cleans up target and dist folders.
> >> >> Hence, when we do ant rdeploy, it fails to scp target/ and
> dist/
> >> to devcloud's /opt/cloudstack/incubator-cloudstack/
> >> >>
> >> >> Manual fix for now:
> >> >> - ssh to devcloud; ssh -p 2222 root@localhost; cd
> >> /opt/cloudstack/incubator-cloudstack; mkdir -p target dist;
> >> >> - back to your host os etc.
> >> >>
> >> >> Applied fix to create dirs before scp-ing on 4.0 branch:
> >> >> 53a3c2f171dfea5de6e0cda2ae3317560ecd91f5
> >> >>
> >> >> DevCloud on master needs fixing with maven, I'll work on this in
> >> case anyone else if not already working on it?
> >> >>
> >> >> Regards.
> >> >>
> >> >>
> >> >> On 16-Oct-2012, at 8:38 PM, Chip Childers
> >> <chip.child...@sungard.com> wrote:
> >> >>
> >> >>> I'm offline in a all day meeting. Can someone help Noah please?
> >> >>>
> >> >>> - chip
> >> >>>
> >> >>> Sent from my iPhone.
> >> >>>
> >> >>> On Oct 16, 2012, at 11:00 AM, Noah Slater <nsla...@tumbolia.org>
> >> wrote:
> >> >>>
> >> >>>> I just tried to clean the source locally and redeploy and get
> the
> >> same
> >> >>>> error.
> >> >>>>
> >> >>>> Chip, can you advise please?
> >> >>>>
> >> >>>> On Tue, Oct 16, 2012 at 2:48 PM, Noah Slater
> >> <nsla...@tumbolia.org> wrote:
> >> >>>>
> >> >>>>> I am following the instructions from the wiki, copy and paste
> >> style.
> >> >>>>>
> >> >>>>> This is the FIRST time the rdeploy thing managed to SSH into
> the
> >> VM.
> >> >>>>>
> >> >>>>> Do these comments still apply? (Should we document them?)
> >> >>>>>
> >> >>>>>
> >> >>>>> On Tue, Oct 16, 2012 at 1:49 PM, Rohit Yadav
> >> <rohit.ya...@citrix.com>wrote:
> >> >>>>>
> >> >>>>>>
> >> >>>>>> On 16-Oct-2012, at 5:48 PM, Noah Slater
> <nsla...@tumbolia.org>
> >> wrote:
> >> >>>>>>
> >> >>>>>>> Now I have this error:
> >> >>>>>>>
> >> >>>>>>> $ ant rdeploy
> >> >>>>>>> Buildfile:
> >> >>>>>>> /private/tmp/cloudstack/apache-cloudstack-4.0.0-incubating-
> >> src/build.xml
> >> >>>>>>> [echo] Using build parameters from
> >> >>>>>> /private/tmp/cloudstack/apache-cloudstack-4.0.0-incubating-
> >> src/build/build-cloud.properties
> >> >>>>>>> [echo] Using company info from
> >> >>>>>> /private/tmp/cloudstack/apache-cloudstack-4.0.0-incubating-
> >> src/build/cloud.properties
> >> >>>>>>> [echo] Using override file from
> >> >>>>>> /private/tmp/cloudstack/apache-cloudstack-4.0.0-incubating-
> >> src/build/replace.properties
> >> >>>>>>> [echo] Using build parameters from
> >> >>>>>> /private/tmp/cloudstack/apache-cloudstack-4.0.0-incubating-
> >> src/build/build-cloud.properties
> >> >>>>>>> [echo] Using company info from
> >> >>>>>> /private/tmp/cloudstack/apache-cloudstack-4.0.0-incubating-
> >> src/build/cloud.properties
> >> >>>>>>> [echo] Using override file from
> >> >>>>>> /private/tmp/cloudstack/apache-cloudstack-4.0.0-incubating-
> >> src/build/replace.properties
> >> >>>>>>> [echo] deploy home:
> >> >>>>>> /private/tmp/cloudstack/apache-cloudstack-4.0.0-incubating-
> >> src/build/deploy
> >> >>>>>>>
> >> >>>>>>> rdeploy:
> >> >>>>>>> [echo] copying build folder to remote
> >> >>>>>>> [scp] Connecting to localhost:2222
> >> >>>>>>> [scp] done.
> >> >>>>>>> [scp] Connecting to localhost:2222
> >> >>>>>>> [scp] done.
> >> >>>>>>> [echo] copying deps folder to remote
> >> >>>>>>> [scp] Connecting to localhost:2222
> >> >>>>>>> [scp] done.
> >> >>>>>>> [echo] copying target folder to remote
> >> >>>>>>> [scp] Connecting to localhost:2222
> >> >>>>>>> [scp] done.
> >> >>>>>>> [echo] copying dist folder to remote
> >> >>>>>>> [scp] Connecting to localhost:2222
> >> >>>>>>> [scp] done.
> >> >>>>>>> [sshexec] Connecting to localhost:2222
> >> >>>>>>> [sshexec] cmd : echo $CATALINA_HOME; export
> >> >>>>>>> CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32;cd
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack;ant deploy-server
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] Buildfile: /opt/cloudstack/incubator-
> >> cloudstack/build.xml
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using build parameters from
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/build-
> >> cloud.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using company info from
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/cloud.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using override file from
> >> >>>>>>> /opt/cloudstack/incubator-
> cloudstack/build/replace.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using build parameters from
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/build-
> >> cloud.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using company info from
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/cloud.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using override file from
> >> >>>>>>> /opt/cloudstack/incubator-
> cloudstack/build/replace.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] deploy home:
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/deploy
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] deploy-common:
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using build parameters from
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/build-
> >> cloud.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using company info from
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/cloud.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using override file from
> >> >>>>>>> /opt/cloudstack/incubator-
> cloudstack/build/replace.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using build parameters from
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/build-
> >> cloud.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using company info from
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/cloud.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] Using override file from
> >> >>>>>>> /opt/cloudstack/incubator-
> cloudstack/build/replace.properties
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] [echo] deploy home:
> >> >>>>>>> /opt/cloudstack/incubator-cloudstack/build/deploy
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] unzip:
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] BUILD FAILED
> >> >>>>>>> [sshexec] /opt/cloudstack/incubator-
> >> cloudstack/build/developer.xml:184:
> >> >>>>>>> src '/opt/cloudstack/incubator-
> >> cloudstack/dist/client/client.war'
> >> >>>>>> doesn't
> >> >>>>>>
> >> >>>>>> Before rdeploying, you need to clean-all build-all and make
> sure
> >> to ant
> >> >>>>>> clean-tomcat (for any unclean issue), I usually ssh and cd to
> >> >>>>>> /opt/cloudstack, git pull and run commands there.
> >> >>>>>>
> >> >>>>>> Regards.
> >> >>>>>>
> >> >>>>>>> exist.
> >> >>>>>>> [sshexec]
> >> >>>>>>> [sshexec] Total time: 1 second
> >> >>>>>>> [sshexec]
> >> >>>>>>>
> >> >>>>>>> BUILD FAILED
> >> >>>>>> /private/tmp/cloudstack/apache-cloudstack-4.0.0-incubating-
> >> src/build/build-devcloud.xml:94:
> >> >>>>>>> Remote command failed with exit status 1
> >> >>>>>>>
> >> >>>>>>> Total time: 55 seconds
> >> >>>>>>>
> >> >>>>>>>
> >> >>>>>>> On Tue, Oct 16, 2012 at 1:16 PM, Noah Slater
> >> <nsla...@tumbolia.org>
> >> >>>>>> wrote:
> >> >>>>>>>
> >> >>>>>>>> Thanks, downloading the binary distribution of Ant and
> >> manually copying
> >> >>>>>>>> ant-jsch.jar worked for me. I have updated the wiki.
> >> >>>>>>>>
> >> >>>>>>>>
> >> >>>>>>>> On Tue, Oct 16, 2012 at 1:01 PM, Sebastien Goasguen
> >> <run...@gmail.com
> >> >>>>>>> wrote:
> >> >>>>>>>>
> >> >>>>>>>>> I followed this:
> >> >>>>>>>>>
> >> >>>>>>>>> http://myvirtual-lab.blogspot.com.es/2009/07/ant-scp-and-
> >> ec2.html
> >> >>>>>>>>>
> >> >>>>>>>>> with updated versions..
> >> >>>>>>>>>
> >> >>>>>>>>> On Oct 16, 2012, at 1:48 PM, Noah Slater
> >> <nsla...@tumbolia.org>
> >> >>>>>> wrote:
> >> >>>>>>>>>
> >> >>>>>>>>>> $ ls -l /usr/share/ant/lib/jsch-0.1.48.jar
> >> >>>>>>>>>> -rw-r--r-- 1 root wheel 226175 15 Oct 20:10
> >> >>>>>>>>>> /usr/share/ant/lib/jsch-0.1.48.jar
> >> >>>>>>>>>>
> >> >>>>>>>>>>
> >> >>>>>>>>>> --
> >> >>>>>>>>>> NS
> >> >>>>>>>>
> >> >>>>>>>>
> >> >>>>>>>> --
> >> >>>>>>>> NS
> >> >>>>>>>
> >> >>>>>>>
> >> >>>>>>>
> >> >>>>>>> --
> >> >>>>>>> NS
> >> >>>>>
> >> >>>>>
> >> >>>>> --
> >> >>>>> NS
> >> >>>>
> >> >>>>
> >> >>>>
> >> >>>> --
> >> >>>> NS
> >> >>
> >> >
