| *** gary_perkins_ has quit IRC | 08:02 | |
| *** flatmush has quit IRC | 08:02 | |
| *** nowster has quit IRC | 08:02 | |
| *** CTtpollard has quit IRC | 08:02 | |
| *** nowster has joined #baserock | 08:02 | |
| *** CTtpollard has joined #baserock | 08:03 | |
| *** flatmush has joined #baserock | 08:03 | |
| *** gary_perkins has joined #baserock | 08:03 | |
| *** ctbruce has joined #baserock | 08:40 | |
| straycat | pedroalvarez, shall we merge the 15.47 into infrastructure? | 08:42 |
|---|---|---|
| straycat | *15.47 tag | 08:42 |
| straycat | also i have no idea what's going on with mason | 08:44 |
| *** paulwaters_ has joined #baserock | 08:45 | |
| *** tiagogomes_ has joined #baserock | 08:54 | |
| tiagogomes_ | straycat are you planning to get rid of the branch and merge plugin? I was trying to do the same | 08:55 |
| *** bashrc_ has joined #baserock | 09:02 | |
| straycat | tiagogomes_, i think that's definitely the plan yes, so if someone else doesn't do it then i might | 09:03 |
| *** fay_ has joined #baserock | 09:04 | |
| tiagogomes_ | straycat getting rid of the plugin is easy once you change the tests to work workspaceless :) | 09:04 |
| straycat | okay cool :) | 09:07 |
| pedroalvarez | straycat: yes. Do you want me to do it? | 09:11 |
| tiagogomes_ | straycat ok. I had a branch to make yarns to not use workspaces. I'll drop it. I can work on the removal of the branch and merge plugin and workspace code | 09:12 |
| straycat | pedroalvarez, no it's okay i have a work in progress branch that i've already made some changes to, some manual fixes will be needed and i need to test them anyway to deploy this gerrit system | 09:12 |
| straycat | tiagogomes_, okay that's annoying i didn't know you were doing that, sorry :/ | 09:12 |
| straycat | tiagogomes_, so far we've been small enough that it's seemed possible to just work on whatever seemed important without duplicating effort | 09:13 |
| *** franred has joined #baserock | 09:13 | |
| straycat | tiagogomes_, removal of branch and merge plugin code would be really cool :) | 09:14 |
| tiagogomes_ | straycat yep. I'll only started Friday afternoon to fix the tests to see how it goes, so not much time to announce what I was doing | 09:14 |
| * straycat nods | 09:16 | |
| *** franred has quit IRC | 09:24 | |
| pedroalvarez | I'm worried about mason having to rebuild a lot of things after the migration to definitions v7 | 09:35 |
| pedroalvarez | (this is more clear in https://mason-x86-32.baserock.org/ ) | 09:35 |
| *** rdale has joined #baserock | 09:38 | |
| *** franred has joined #baserock | 09:39 | |
| tiagogomes_ | straycat, what `git checkout -` does? | 09:49 |
| pedroalvarez | like `cd -` but with branches? | 09:50 |
| straycat | yes | 09:51 |
| *** jonathanmaw has joined #baserock | 09:51 | |
| straycat | tiagogomes_, you could probably remove them since most of the commands say what branch the operation should be performed in, but i just put them in so we restore the original state just in case | 09:52 |
| tiagogomes_ | straycat ta | 09:53 |
| *** franred has quit IRC | 09:56 | |
| *** franred has joined #baserock | 09:58 | |
| pedroalvarez | ha, i know what's going on | 09:58 |
| pedroalvarez | we added the following in buildsystem.py: | 09:59 |
| pedroalvarez | 'elif [ -e bootstrap ]; then ./bootstrap; ' + | 09:59 |
| pedroalvarez | 'elif [ -e bootstrap.sh ]; then ./bootstrap.sh; ' + | 09:59 |
| pedroalvarez | but those are not in DEFAULTS | 09:59 |
| *** gtristan has joined #baserock | 10:02 | |
| *** ssam2 has joined #baserock | 10:02 | |
| *** ChanServ sets mode: +v ssam2 | 10:02 | |
| pedroalvarez | i don't know how to deal with this :/ | 10:07 |
| pedroalvarez | I wonder if ssam2 has any suggestion about it (context: http://paste.baserock.org/efifezokut) | 10:09 |
| ssam2 | fix DEFAULTS | 10:12 |
| ssam2 | hmm, better fix migrations/initial-defaults-whatever too | 10:12 |
| pedroalvarez | will do | 10:12 |
| *** toscalix has joined #baserock | 10:13 | |
| pedroalvarez | right: https://gerrit.baserock.org/1485 | 10:18 |
| pedroalvarez | also, this one fixes jetson builds: https://gerrit.baserock.org/#/c/1484/ | 10:18 |
| pedroalvarez | turns out the migration script was OK, but the migration patch was old, and needed a new version | 10:19 |
| *** locallycompact has joined #baserock | 10:20 | |
| pedroalvarez | The other fix, (for jetson systems) is needed now that morph complains if there are duplicated chunk names | 10:20 |
| pedroalvarez | https://gerrit.baserock.org/1485 | 10:27 |
| pedroalvarez | grr | 10:27 |
| pedroalvarez | thanks for reviewing jjardon | 10:27 |
| pedroalvarez | anyone else for https://gerrit.baserock.org/#/c/1484/ and https://gerrit.baserock.org/1485 ? :) :) | 10:27 |
| richard_maw | seems a little odd that we don't just split the device tree compiler chunk out as we ought to be able to use the same compiler | 10:29 |
| richard_maw | but I do remember it not being entirely API stable, so I'll +1 | 10:29 |
| pedroalvarez | thanks richard_maw :) | 10:31 |
| pedroalvarez | this is being the bugfixing morning :) | 10:37 |
| pedroalvarez | Another one: https://gerrit.baserock.org/1486 | 10:38 |
| richard_maw | +2'd | 10:38 |
| pedroalvarez | good :) | 10:43 |
| straycat | pedroalvarez, the branch i have for the infra is here http://git.baserock.org/cgi-bin/cgit.cgi/baserock/baserock/infrastructure.git/log/?h=baserock/richardipsum/merge-baserock-15.47 | 10:49 |
| straycat | if folks would rather i sent the request for merge to the ml then let me know | 10:50 |
| straycat | oh dear, so we are in a situation where the release can be built with 15.34 but cannot build itself? | 10:52 |
| straycat | for jetson systems that is | 10:53 |
| pedroalvarez | seems I've forgotten how to merge branches | 10:57 |
| pedroalvarez | merge: baserock/richardipsum/merge-baserock-15.47 - not something we can merge | 10:57 |
| jjardon | Id suggest to do a baserock-15.47.1 "bugfix" release | 10:58 |
| straycat | pedroalvarez, eh? | 10:59 |
| straycat | jjardon, i think we probably should | 11:00 |
| pedroalvarez | straycat: I'm just trying to merge your branch :) | 11:01 |
| pedroalvarez | it looks good, please merge it on master | 11:01 |
| straycat | pedroalvarez, ok merged, i somehow based it a few commits behind latest master, so rebased before merging to avoid another merge commit | 11:16 |
| pedroalvarez | :) ta | 11:21 |
| pedroalvarez | straycat: any other change needed can go through gerrit | 11:21 |
| pedroalvarez | feel free to ping me to get reviews on them | 11:22 |
| * straycat nods | 11:24 | |
| straycat | will do thanks | 11:24 |
| pedroalvarez | straycat: I'm afraid this one is for you to fix: https://mason-x86-32.baserock.org/log/ae754c67bfc3a278ab9c7e6d8955ebe057e93511--2015-11-23%2011:43:48.log | 11:45 |
| straycat | sigh | 11:47 |
| straycat | i blame the reviewers >.> | 11:47 |
| pedroalvarez | :) sorry | 11:47 |
| pedroalvarez | hahah | 11:47 |
| pedroalvarez | we have this check in mason because it's diffucult to spot | 11:48 |
| tiagogomes_ | yikes | 11:49 |
| tiagogomes_ | which change introduced that? | 11:49 |
| straycat | the import deps change | 11:52 |
| straycat | basically we need to push my local fork to baserock/master of the carton repo on gbo | 11:53 |
| straycat | so, merging http://git.baserock.org/cgi-bin/cgit.cgi/delta/carton.git/log/?h=baserock/richardipsum/allow-set-perl-carton-cpanm-opt into baserock/master and updating the sha should fix that | 11:58 |
| straycat | the "fork" is actually only a one-line delta on upstream that allows an environment variable to be set | 11:59 |
| pedroalvarez | straycat: should i fix it? | 12:00 |
| straycat | fix what? | 12:01 |
| pedroalvarez | do you mind if I call the branch baserock/v1.0.21 ? | 12:01 |
| straycat | that seems fine to me | 12:01 |
| pedroalvarez | good :) | 12:01 |
| straycat | pedroalvarez, shall i send the definitions update? | 12:04 |
| pedroalvarez | straycat: if you have that ready go ahead. I was only a commit msg from that | 12:06 |
| straycat | i can send it later once i've seen it build | 12:10 |
| pedroalvarez | ok :) | 12:11 |
| *** petefotheringham has joined #baserock | 12:37 | |
| *** petefotheringham has quit IRC | 13:12 | |
| *** petefotheringham has joined #baserock | 13:13 | |
| *** petefoth1ringham has joined #baserock | 13:17 | |
| *** petefoth1ringham has quit IRC | 13:21 | |
| *** petefotheringham has quit IRC | 13:21 | |
| *** petefotheringham has joined #baserock | 13:22 | |
| *** petefotheringham has quit IRC | 13:24 | |
| *** toscalix has quit IRC | 13:24 | |
| *** petefotheringham has joined #baserock | 13:28 | |
| *** petefotheringham has quit IRC | 13:31 | |
| *** petefotheringham has joined #baserock | 13:32 | |
| *** petefotheringham has quit IRC | 13:35 | |
| *** petefotheringham has joined #baserock | 13:39 | |
| *** toscalix has joined #baserock | 13:39 | |
| *** edcragg has joined #baserock | 14:15 | |
| *** thrace_ is now known as thrace | 14:54 | |
| straycat | ssam2, can gerrit not use the java stratum that jmacs added? | 14:54 |
| ssam2 | sorry, what's the context? | 15:04 |
| ssam2 | i've no idea of the answer | 15:04 |
| ssam2 | it works with the binary JRE currently | 15:04 |
| pedroalvarez | my guess is that it wasn't used given that that java stratum was created 4 months later | 15:04 |
| straycat | tiagogomes_, i meant to say that i think https://gerrit.baserock.org/#/c/929/ may have removed a little too much, we probably still want to test temporary build branches since it's used for local-changes | 15:05 |
| straycat | i was working on something to partially restore that but it's incomplete | 15:05 |
| straycat | some of those yarns were removed because they used edit, they could instead be rewritten to not use edit. | 15:07 |
| tiagogomes_ | straycat maybe, but as we have a BuildBranch class, maybe we could unit test it instead? | 15:07 |
| straycat | i don't know, for now since it's dead i wouldn't -1 removing it, but expect that we may end up restoring/rewriting some of the implementations | 15:09 |
| tiagogomes_ | it will be always on git history | 15:09 |
| straycat | indeed | 15:10 |
| tiagogomes_ | as a fun fact, morph currently doesn't delete temporary branches when not using workspaces :) | 15:10 |
| * persia continues to think morph should fail loudly when it encounters uncommitted local changes in definitions | 15:11 | |
| straycat | yes well i guess none of that is tested | 15:11 |
| straycat | persia, it's user-defined at the moment | 15:11 |
| straycat | if you want that behaviour then you set --local-changes=ignore (which is what i tend to use at least) | 15:12 |
| persia | Yes. Just in the context of removing code ... :) | 15:13 |
| * straycat nods | 15:13 | |
| *** petefotheringham has quit IRC | 15:13 | |
| * tiagogomes_ likes that morph includes uncommitted changes by default | 15:13 | |
| *** petefotheringham has joined #baserock | 15:14 | |
| * persia thinks it supports workflows with invrequent commits, leading to lack of traceability | 15:14 | |
| straycat | otoh, i get that it can be annoying to have to commit (and push) every little change, i think leaving it up to the user is actually okay for now | 15:15 |
| persia | Why do you have to push? | 15:17 |
| * persia would very much not support any workflow suggesting push on every change, as that encourages `push -f`, which is bad | 15:17 | |
| straycat | without local changes it's using the remote | 15:18 |
| persia | Right then. | 15:18 |
| persia | That clearly should be disentangled. I want a way to make a commit locally and be able to work from that. Without that, the distributed nature of git is not helping. | 15:19 |
| persia | And if we're not being distributed, then all the fussing with git isn't helping: we could just use tools that maintain a common store. | 15:20 |
| straycat | *nod* we'll get there i think :) | 15:21 |
| ssam2 | I agree that Morph should be able to read the files from the repo the user is working in, instead of only looking in its locally cached version of that repo | 15:22 |
| ssam2 | you might still need to push on every commit if you are using a remote builder | 15:22 |
| ssam2 | which you probably need to do if you are building for non-x86 | 15:22 |
| persia | That needs sorting. | 15:23 |
| persia | I should be able to pass the build information in such a way that it doesn't require me to muddy the central infrastructure. | 15:23 |
| persia | Otherwise every possible spelling mistake that got test-built ends up being stored on the internet forever, which doesn't sound appealing at all. | 15:24 |
| tiagogomes_ | what is the purpose of the get-chunk-details command ? | 16:43 |
| tiagogomes_ | seems useless to tme | 16:44 |
| tiagogomes_ | s/tme/me | 16:44 |
| straycat | it seems to print a chunk's details to the screen :) | 16:46 |
| ssam2 | was requested by a user | 16:46 |
| straycat | it does at least show what your repo alias gets resolves to | 16:47 |
| * tiagogomes_ would like to know what was on the mind of that user | 16:47 | |
| straycat | *resolved | 16:47 |
| straycat | and your ref | 16:47 |
| straycat | it does seem a little pointless | 16:50 |
| tiagogomes_ | to me it seems a bit more than little | 16:51 |
| ssam2 | the idea was so they could get the real URL for a chunk, i believe | 16:51 |
| tiagogomes_ | mm, the alias are still hardcoded in morph right | 16:52 |
| straycat | yes, but you can also set them in the config i think | 16:52 |
| richard_maw | which is unfortunate, since it ought to belong in the definitions | 16:53 |
| tiagogomes_ | that's what I was thinking | 16:53 |
| tiagogomes_ | why didn't go into the DEFAULTS? | 16:53 |
| tiagogomes_ | if they were there, it would weakness further the existence of the get-chunk plugin | 16:54 |
| straycat | if repo aliases are that confusing, we could also simplify it by just having an alias for the trove url, and leave the repo section of the url in tact, so instead of upstrea:perl you have trove:delta/perl | 16:54 |
| tiagogomes_ | I never founded the aliases to be confusing | 16:54 |
| tiagogomes_ | finded | 16:55 |
| tiagogomes_ | no still not | 16:55 |
| tiagogomes_ | argh | 16:55 |
| * tiagogomes_ gives up | 16:55 | |
| straycat | the 'baserock' can be, i originally thought that was hardcoded to git.baserock.org, not $trove:baserock/baserock/<repo> | 16:55 |
| straycat | so if it was trove:baserock/baserock/<repo> that might be clearer? idk | 16:56 |
| * edcragg found the aliases confusing | 16:56 | |
| edcragg | 'upstream' is a very vague alias | 16:56 |
| tiagogomes_ | Well, the mapping upstream -> delta can be confusing | 16:58 |
| SotK | are the aliases not build tool configuration rather than something that belongs in DEFAULTS? | 17:00 |
| tiagogomes_ | I think that they should belong to DEFAULTS as they are used in definitions | 17:01 |
| ssam2 | Having default ones in definitions.git makes sense, perhaps | 17:03 |
| ssam2 | but they are a mechanism to separate the URLs in definitions from the real URLs | 17:03 |
| * persia also found aliases confusing, and likes the use of "trove:delta/perl" or similar | 17:05 | |
| straycat | pedroalvarez, is the jetson build/deployment with the bsp change looking okay? | 17:10 |
| SotK | I think I'd prefer that to putting default translations of the aliases in definitions | 17:11 |
| ssam2 | persia: i thought you hated troves :-) | 17:11 |
| persia | ssam2: I do, but that lets me then complain about useless-use-of-the-word-trove, and move to "git-server:delta/perl" :) | 17:11 |
| pedroalvarez | straycat: yep | 17:11 |
| persia | (or local-mirror:delta/perl) | 17:12 |
| pedroalvarez | straycat: is this for fixing the release? | 17:12 |
| straycat | pedroalvarez, okay, i think we should probably make a new branch for a point release of 15.47.1 by cherry picking http://git.baserock.org/cgi-bin/cgit.cgi/baserock/baserock/definitions.git/commit/?id=7d7c21db688eb73ecfd5c426fc5491a0e068e72c onto baserock/release/baserock-15.47 | 17:12 |
| straycat | then tag that | 17:13 |
| pedroalvarez | straycat: we have had a similar situation in the past | 17:15 |
| pedroalvarez | with the 15.19 | 17:16 |
| pedroalvarez | I'm sad we didn't create a branch for tags 15.191 and .2 | 17:17 |
| pedroalvarez | s/191/19.1/ | 17:17 |
| *** ctbruce has quit IRC | 17:17 | |
| straycat | so you're happy with that suggestion then? | 17:17 |
| pedroalvarez | I was going to suggest to cherrypick the patch on the same release branch | 17:17 |
| pedroalvarez | but I'm h appy with the suggestion, yes | 17:18 |
| pedroalvarez | I don't think we need to release the systems this time though | 17:18 |
| straycat | okay, i don't mind, branches are cheap though | 17:18 |
| pedroalvarez | they are! :) | 17:18 |
| straycat | yes i don't think we need to release the systems either | 17:19 |
| straycat | okay i'll do that then | 17:19 |
| * tiagogomes_ sends https://gerrit.baserock.org/#/q/status:open+project:baserock/baserock/morph+branch:master+topic:rip-branch-and-merge | 17:20 | |
| tiagogomes_ | I'll have a look in the wiki and do the necessary updates | 17:21 |
| straycat | pedroalvarez, does http://git.baserock.org/cgi-bin/cgit.cgi/baserock/baserock/definitions.git/log/?h=baserock/release/baserock-15.47.1 look correct to you? | 17:34 |
| pedroalvarez | it does | 17:35 |
| straycat | great, i'll tag it then | 17:35 |
| pedroalvarez | thanks straycat | 17:36 |
| *** tiagogomes_ has quit IRC | 17:43 | |
| *** franred has quit IRC | 17:51 | |
| straycat | no problem, hopefully that's sorted now :) | 17:52 |
| *** edcragg has quit IRC | 17:57 | |
| *** edcragg has joined #baserock | 17:58 | |
| *** jonathanmaw has quit IRC | 18:00 | |
| *** locallycompact has quit IRC | 18:01 | |
| *** bashrc_ has quit IRC | 18:04 | |
| *** rdale has quit IRC | 18:13 | |
| *** ssam2 has quit IRC | 18:40 | |
| *** gtristan has quit IRC | 18:50 | |
| *** edcragg has quit IRC | 19:03 | |
| *** toscalix has quit IRC | 19:12 | |
| jjardon | Hi!, any idea when mason will be updated? seems its failing at the moment after the recent upgrades | 19:26 |
| *** locallycompact has joined #baserock | 21:34 | |
| pedroalvarez | jjardon: it has been upgraded. We had some failures but everything has been fixed now | 21:53 |
| jjardon | Ah! Nice! | 21:55 |
Generated by irclog2html.py 2.15.3 by Marius Gedminas - find it at mg.pov.lt!