Hi Clark,
You might find the following series of commands help automate this a little
more.
git merge -s ours --no-commit feature/zuulv3
git read-tree -u --reset feature/zuulv3
git commit -m "replace mainline with feature/zuulv3"
Basically it replaces the current branch contents with everything
Hi,
On Thursday, January 18, 2018, we will merge the feature/zuulv3 branches
of both Zuul and Nodepool into master.
If you continuously deploy Zuul or Nodepool from master, you should make
sure you are prepared for this.
The current version of the single_node_ci pattern in puppet-openstackci
sho
Clark Boylan writes:
> Hello,
>
> I think we are very close to being ready to merge the zuulv3 feature
> branch into master in both the Zuul and Nodepool repos. In particular
> we merged https://review.openstack.org/#/c/523951/ which should
> prevent breakages for anyone using that deployment met
Hello,
I think we are very close to being ready to merge the zuulv3 feature branch
into master in both the Zuul and Nodepool repos. In particular we merged
https://review.openstack.org/#/c/523951/ which should prevent breakages for
anyone using that deployment method (single_node_ci) for an all
