Hey Mark, I found the current svn merge approach is:
$ svn merge ^/branches/my-branch So I ended up checking out 'live' and doing: $ svn merge ^/gump/branches/python3 which looked promising so I commit. Fingers crossed we are now back live on python3. P.S. I also managed to SSH into gump-vm2. regards, Adam On Mon, Nov 30, 2020 at 8:01 AM Mark Thomas <ma...@apache.org> wrote: > Woot! > > The last run only had a single failure (test-ant) and that has been > failing for months. > > I think we are good to merge the changes in the branch back into live. > > Adam, if you can get that done, I'll get gump-vm2 moved back over to > live, re-enable Puppet and then get infra to re-enable the cron jobs. > > Almost there... > > Mark > > > On 30/11/2020 08:41, Mark Thomas wrote: > > On 29/11/2020 22:04, Adam Jack wrote: > >> Hey Mark > >> > >> It transpires that there was an "isinstance(self.value, NoneType)" that > got > >> converted to an "self.value is *not* None" reversing the intent. Fixed > and > >> commit to SVN (python3 branch) after a unit test added. > > > > Thanks. I've just started a new run. All green so far. > > > > /me waits a little while > > > > Ah. We have failures but those are genuine build failures rather than a > > python2 vs python3 error. (Commons Logging has some issues). Looking > good. > > > > What do you think about merging the changes back into gump/live vs > > continuing with the branch? > > > > Mark > > > > > >> > >> regards > >> > >> Adam > >> > >> On Sun, Nov 29, 2020 at 11:36 AM Mark Thomas <ma...@apache.org> wrote: > >> > >>> Hi Adam, > >>> > >>> The current run started at Sun, 29 Nov 2020 18:19:38 (UTC). Details at: > >>> http://gump-vm2.apache.org/buildLog.html > >>> > >>> This failure looks like one you'll be able to fix much faster than me: > >>> > >>> > http://gump-vm2.apache.org/apr/apr-configure/gump_work/build_apr_apr-configure.html > >>> > >>> Mark > >>> > >>> On 29/11/2020 18:03, Mark Thomas wrote: > >>>> On 29/11/2020 15:18, Adam Jack wrote: > >>>>> Thanks for testing it out Mark. > >>>>> > >>>>> If you need help taking it from here, let me know, and if I can gain > >>> access > >>>>> to the VM I'll help out. > >>>>> > >>>>> [ I am away (social distancing at a family cabin) and if I have any > >>> access > >>>>> keys they'll be on some old machines that I don't have easy access > to. ] > >>>> > >>>> I think we are almost there. A proper run started which is further > than > >>>> it got before but gump then failed during the run (looks to be most of > >>>> the way through). > >>>> > >>>> I suspect there are only a handful of fixes to go but run, fail, fix > >>>> repeat will quickly get time consuming as the run part (when it is > >>>> working) takes between 8 and 12 hours. Having two of us able to check > on > >>>> it, fix the latest issue and start the next run will be a big help. > >>>> > >>>> Once everything is working we can merge the change back into trunk, > >>>> update the Puppet config, restart Puppet and we should be good to go. > >>>> > >>>> With that in mind, the first step to getting you access to the VM is > >>>> that you need to add an ssh key via id.apache.org. > >>>> > >>>> I should then be able to get you access to the machine. With access to > >>>> the machine you can do the OPIE/ortpasswd dance so you can use sudo. > >>>> > >>>> I'm just fixing the errors I can see in preparation for the next run. > >>>> > >>>> Thanks, > >>>> > >>>> Mark > >>>> > >>>> > >>>>> > >>>>> regards, > >>>>> > >>>>> Adam > >>>>> > >>>>> On Sun, Nov 29, 2020 at 2:31 AM Mark Thomas <ma...@apache.org> > wrote: > >>>>> > >>>>>> On 29/11/2020 01:18, Adam Jack wrote: > >>>>>>> Hey Mark, > >>>>>>> > >>>>>>> I've taken a shot (on a Macbook) at porting Gump to Python 3. I > used > >>>>>> "2to3" > >>>>>>> a bunch, but then manually worked on updates continually running > >>> Gump's > >>>>>>> unit test. I don't know how complete the coverage of those tests > is, > >>> but > >>>>>>> hopefully it is a start. (I couldn't seem to install 'anydbm' on my > >>> mac, > >>>>>> so > >>>>>>> I mocked it and commented it out, for now.) > >>>>>>> > >>>>>>> ---------------------------------------------------- Gump > >>>>>>> Performed [102] tests with [0] issues. > >>>>>>> No Problems Detected > >>>>>>> > >>>>>>> I commit to a branch: > >>>>>>> > >>>>>>> https://svn.apache.org/repos/asf/gump/branches/python3/ > >>>>>>> > >>>>>>> I'm not sure how I access the VM to try the full Gump run. Let me > >>> know if > >>>>>>> there is anything more I can do to complete the migration. > >>>>>> > >>>>>> Hi Adam, > >>>>>> > >>>>>> Thanks - this is great. I'll test on the VM and let you know. > >>>>>> > >>>>>> Mark > >>>>>> > >>>>>>> > >>>>>>> regards, > >>>>>>> > >>>>>>> Adam > >>>>>>> > >>>>>>> On Fri, Nov 27, 2020 at 12:29 PM Mark Thomas <ma...@apache.org> > >>> wrote: > >>>>>>> > >>>>>>>> Hi, > >>>>>>>> > >>>>>>>> Ubuntu 20.04 comes with python3. You can make python2 work but it > >>>>>>>> involves jumping through some hoops. > >>>>>>>> > >>>>>>>> Gump doesn't work with python 3. I've spent a couple of hours > trying > >>> to > >>>>>>>> fix this (patch on gump-vm2 in /home/markt) and I have reached the > >>> end > >>>>>>>> of my (very) limited python skills. > >>>>>>>> > >>>>>>>> So, we have a choice. Python 2 or Python 3? > >>>>>>>> > >>>>>>>> Python 3 will need someone else to get Gump working on gump-vm2. > >>>>>>>> > >>>>>>>> Python 2 I can handle but I may take a few shortcuts and not put > >>>>>>>> everything in Puppet on the basis we rebuild the server so > >>> infrequently > >>>>>>>> that it is less effort to rebuild python 2 support manually than > get > >>> it > >>>>>>>> into Puppet. > >>>>>>>> > >>>>>>>> Or there is the other option - send Gump to the attic. > >>>>>>>> > >>>>>>>> Gump has been useful in the past in identifying issues other CI > >>> systems > >>>>>>>> did not. Gump provides the Tomcat project with earlier sight of > >>> OpenSSL > >>>>>>>> integration issues we don't get any other way. Gump going to the > >>> attic > >>>>>>>> would be a loss to the Tomcat project but it would be a relatively > >>> small > >>>>>>>> loss. > >>>>>>>> > >>>>>>>> If someone has the time and skills to get Gump onto Python 3 now > then > >>>>>>>> I'd support that. If not, my vote is for getting python2 running > in > >>> the > >>>>>>>> short term and hope someone can look at python3 support in the > >>> medium to > >>>>>>>> long term. > >>>>>>>> > >>>>>>>> Thoughts? > >>>>>>>> > >>>>>>>> Mark > >>>>>>>> > >>>>>>>> > --------------------------------------------------------------------- > >>>>>>>> To unsubscribe, e-mail: general-unsubscr...@gump.apache.org > >>>>>>>> For additional commands, e-mail: general-h...@gump.apache.org > >>>>>>>> > >>>>>>>> > >>>>>>> > >>>>>> > >>>>>> > >>>>>> > --------------------------------------------------------------------- > >>>>>> To unsubscribe, e-mail: general-unsubscr...@gump.apache.org > >>>>>> For additional commands, e-mail: general-h...@gump.apache.org > >>>>>> > >>>>>> > >>>>> > >>>> > >>>> > >>>> --------------------------------------------------------------------- > >>>> To unsubscribe, e-mail: general-unsubscr...@gump.apache.org > >>>> For additional commands, e-mail: general-h...@gump.apache.org > >>>> > >>> > >>> > >>> --------------------------------------------------------------------- > >>> To unsubscribe, e-mail: general-unsubscr...@gump.apache.org > >>> For additional commands, e-mail: general-h...@gump.apache.org > >>> > >>> > >> > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: general-unsubscr...@gump.apache.org > > For additional commands, e-mail: general-h...@gump.apache.org > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: general-unsubscr...@gump.apache.org > For additional commands, e-mail: general-h...@gump.apache.org > > -- Adam R. B. Jack https://www.neukadye.com https://adamjack.wordpress.com/
