On Wed, 2014-04-23 at 20:40 +0000, Dane Leblanc (leblancd) wrote: > Jay: > > Thanks, your merger-logging.conf file helped me get further... the Jenkins > jobs are now being called after the merge.
Awesome news :) > For the Jenkins job script... Is there a way to run DevStack and tell it to > clone one project (openstack/neutron, in my case) from the local merged repo, > but to clone all other projects from the usual github? Is there a localrc > setting (e.g. NEUTRON_BRANCH) which can be used for this? Yup, there is. There are environment variables (ZUUL_REF, ZUUL_PROJECT, ZUUL_BRANCH, etc) that are passed by Gerrit to Zuul and may be used by scripts to set up your environment. Unless there's a *really* good reason not to, I would advise using the upstream devstack-gate setup scripts to construct your environment. These scripts understand the ZUUL_XXX variables and call devstack's stack.sh script and set up all the plumbing for you to point the Zuul-controlled Git repositories to either the SHA1 of the commit being tested, or the HEAD of the master branches of other projects. You can control the devstack-gate scripts with a dizzying array of environment variables as well. I'd recommend giving these articles a read. They will walk you through devstack-gate and their integration with Zuul. http://www.joinfu.com/2014/01/understanding-the-openstack-ci-system/ http://www.joinfu.com/2014/02/setting-up-an-openstack-external-testing-system/ http://www.joinfu.com/2014/02/setting-up-an-openstack-external-testing-system-part-2/ You can always find me on IRC #openstack-nova or #openstack-neutron. I'm happy to help you. Best, -jay > Thanks again, > Dane > > -----Original Message----- > From: Jay Pipes [mailto:[email protected]] > Sent: Tuesday, April 22, 2014 6:22 PM > To: Dane Leblanc (leblancd) > Cc: [email protected] > Subject: Re: [OpenStack-Infra] [openstack-dev] [infra] Basic zuul merger > startup > > On Tue, 2014-04-22 at 20:05 +0000, Dane Leblanc (leblancd) wrote: > > Jay: > > > > Thanks for your help! I manually started the zuul-merger service, and > > things are progressing further, but with merge errors. > > > > I'm not seeing a /var/log/zuul/zuul-merger.log, but I'm don't have the > > merger logging set up correctly in the zuul.conf. The zuul documentation > > suggests: > > > > [merger] > > log_config=/etc/zuul/logging.yaml > > > > Do you know where I might find a sample logging.yaml? (There's a > > logging.conf in the zuul repo, but that doesn't have anything that's > > zuul-merger specific). > > Hmm, actually no, I'm not familiar with a logging.yaml file. > > So, I checked out the upstream puppet module installation and I see this in > their zuul.conf [1]: > > log_config=/etc/zuul/merger-logging.conf > > You can see the merger-logging.conf file here: > > https://git.openstack.org/cgit/openstack-infra/config/tree/modules/openstack_project/files/zuul/merger-logging.conf > > I'd just go ahead and copy that to /etc/zuul/merger-logging.conf > > Best, > -jay > > [1] > https://git.openstack.org/cgit/openstack-infra/config/tree/modules/zuul/templates/zuul.conf.erb > > > _______________________________________________ OpenStack-Infra mailing list [email protected] http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra
