| powersj | smoser, jenkins URL is now externally available at: https://jenkins.ubuntu.com/server/ | 14:46 |
|---|---|---|
| powersj | I am working this morning to update the URLs generated by the CI bot and to get venonat online for the vmtests. | 14:46 |
| smoser | powersj, awesome! | 14:50 |
| smoser | venonat is offline | 14:50 |
| smoser | (just i saw that there, fyi) | 14:50 |
| smoser | powersj, is it possible to hide things from non-logged in users ? | 14:51 |
| smoser | i could see doing something stupid in a slave config | 14:51 |
| powersj | yeah sounds like IS doesn't have access to it, so I have to manually update it's URL for Jenkins to the new one. | 14:51 |
| smoser | such as exposing a credential or something in its log | 14:51 |
| powersj | smoser, agreed, let me look into that | 14:51 |
| powersj | in fact I am going to blow away the slave-config logs we have | 14:52 |
| rharper | powersj: nice! | 15:16 |
| smoser | harlowja, aorund ? | 18:26 |
| harlowja | sup | 18:26 |
| smoser | we used bzr revno before | 18:27 |
| smoser | for a ever-increasing number | 18:27 |
| smoser | i think pbr has a way of doing a similar thing | 18:27 |
| smoser | that is failrly standard. | 18:27 |
| smoser | and i think you have at some point given sane way of getting that. | 18:27 |
| rharper | smoser: don't you love the random last 7 chars of git hash ? | 18:29 |
| smoser | well they dont always go up | 18:29 |
| smoser | thats what i dont like. | 18:29 |
| rharper | I know | 18:29 |
| rharper | =) | 18:29 |
| rharper | well, git describe --tags --long | 18:30 |
| smoser | maybe we can just go with that until we're unlucky | 18:30 |
| smoser | :) | 18:30 |
| rharper | does prepend a number of commits since tag | 18:30 |
| smoser | yea, ok. | 18:30 |
| rharper | so you get 0.7.6, then 0.7.6-N-hash, and then 0.7.5-N+M-hash | 18:30 |
| rharper | that sorta helps I think | 18:30 |
| rharper | I need to play with that to confirm | 18:31 |
| smoser | what is -N+M ? | 18:32 |
| smoser | whats the M | 18:32 |
| rharper | M may be more than one commit since the previous number | 18:32 |
| rharper | similar to revno I guess then | 18:32 |
| rharper | it's offset in numbver of commits since tag | 18:33 |
| rharper | http://paste.ubuntu.com/21428257/ | 18:33 |
| rharper | master reports as 1021 commits since 0.7.6 was tagged | 18:34 |
| rharper | =) | 18:34 |
| smoser | but why did you say '-M' | 18:34 |
| smoser | er.. +M | 18:34 |
| rharper | I just meant that it may be more than 1 since the last time you ran describe | 18:34 |
| smoser | ah. | 18:34 |
| rharper | I'm sure I confused you | 18:34 |
| smoser | ok. | 18:34 |
| smoser | its easy to do | 18:34 |
| smoser | :) | 18:34 |
| rharper | no, head to keyboard transfer isn't always perfect | 18:35 |
| rharper | usually PBCAC for me | 18:35 |
| smoser | heres hwat sucks. | 18:39 |
| smoser | ew can't use 0.7.6-XXX | 18:39 |
| smoser | as we've already released 0.7.7~bzrX | 18:40 |
| smoser | which is > 0.7.6- | 18:40 |
| smoser | rharper, so. .. | 18:49 |
| smoser | $ git describe --tags | 18:50 |
| smoser | 0.7.6-1022-g36e92d3 | 18:50 |
| smoser | what is g36e92d3 ? | 18:50 |
| smoser | ah. the g . ii forgot about that. | 18:51 |
| rharper | git describe --tags --long | 19:17 |
| rharper | the g is hardcoded | 19:17 |
| rharper | for whatever reason | 19:17 |
| rharper | g + 7 chars of the hash | 19:17 |
| rharper | smoser: need to tag 0.7.7 | 19:18 |
| smoser | yeah. | 19:20 |
| rharper | I rant into trouble with git since changlog has 0.7.7 but it's not bumped in the repo | 19:21 |
| rharper | but since larsks branch drops the changelog building, it was no longer an issue; that said, we should still tag it for a new deb build | 19:21 |
| harlowja | so ya, pbr us one solution here | 19:42 |
| harlowja | there is another one that can also help figure out the version to | 19:42 |
| harlowja | https://pypi.python.org/pypi/setuptools_scm is one | 19:44 |
| harlowja | there are a few more | 19:44 |
| harlowja | i'm ok with any of them really | 19:45 |
| harlowja | https://pypi.python.org/pypi/setuptools_scm#default-versioning-scheme | 19:45 |
| harlowja | is that fine with folks? | 19:46 |
| harlowja | that one seems to be the 'the blessed package to manage your versions by scm tags' | 19:46 |
| harlowja | https://github.com/pypa/setuptools_scm/ | 19:46 |
| harlowja | i guess from the pip folks? | 19:46 |
| smoser | harlowja, thanks. | 20:02 |
| smoser | rharper, or larsks is it ok for me to annotate tags and push them overwrite ? | 20:02 |
| larsks | smoser: it is okay to overwrite tags, sure. | 20:03 |
| smoser | rharper, i think the easiest answer to ~ or + is to just use + and to release an 0.7.7 | 20:03 |
| rharper | y | 20:03 |
| smoser | and then use + always fom here out. | 20:03 |
| larsks | people who have checked out the repository will probably need to do an explicit get pull --tags to get the updated tags. | 20:04 |
| rharper | y | 20:04 |
| smoser | 0.7.7+1-ghash | 20:04 |
| smoser | larsks, yeah. | 20:04 |
| smoser | how can i get the commit hash that a signed/annotated tag points to ? | 20:04 |
| harlowja | $ git checkout <tag> && git log -n 1 | 20:06 |
| harlowja | ? | 20:06 |
| harlowja | prob a better way, ha | 20:06 |
| smoser | $ git show 0.7.6 | awk '$1 == "commit" { print $2 ; exit(0); }' | 20:06 |
| smoser | yeah | 20:06 |
| smoser | ok | 20:06 |
| harlowja | so https://pypi.python.org/pypi/setuptools_scm#default-versioning-scheme what we gona go with? | 20:06 |
| harlowja | i'd prefer that one over pbr (although its similar) | 20:07 |
| harlowja | hmmmm, ok, let me know when thats done | 20:09 |
| harlowja | i'll have to redo my fork and reviews i think | 20:09 |
| harlowja | then i can get my jenkins stuff thats internally building cloud-init rpm back into shape | 20:13 |
| harlowja | (using new jenkins way) | 20:13 |
| harlowja | *git way | 20:14 |
| smoser | harlowja, it shoudlnt hur your checkout | 20:14 |
| smoser | it just changes the tags | 20:14 |
| harlowja | kk | 20:14 |
| smoser | http://paste.ubuntu.com/21439291/ | 20:22 |
| smoser | that is 'sign-tag' and me running it. | 20:22 |
| smoser | i'm going to push now to master | 20:23 |
| harlowja | proof its u? | 20:25 |
| harlowja | how do i really know | 20:25 |
| harlowja | u could be the fake-scott | 20:25 |
| smoser | harlowja, its the same key that signs important things. | 20:34 |
| smoser | like cirros builds | 20:34 |
| harlowja | it better be | 20:35 |
| harlowja | or i'm calling the police | 20:35 |
| harlowja | lol | 20:35 |
| smoser | larsks, hey still arond ? | 20:56 |
| larsks | yessir. | 20:56 |
| larsks | smoser: ^^^ | 20:56 |
| smoser | i have some changes here to get bddeb to build | 20:56 |
| smoser | on top of your branch. | 20:56 |
| smoser | in bzr world, i'd just commit on yours, push and then request merge. of those | 20:57 |
| smoser | how would i do this in a sane way. | 20:57 |
| smoser | i dont care really about the annotation just want to get somethign to you i guess. | 20:57 |
| larsks | I think I would approximately the same thing: I would start a new branch based on mine, push it, and request merge. | 20:57 |
| larsks | And then hope that launchpad isn't crazy. | 20:58 |
| larsks | And then merge your changes after mine merge... | 20:58 |
| smoser | ok. | 20:59 |
| larsks | (honestly, I just wish everyone in the world used gerrit for handling code submissions, because it has great handling of changeset dependencies) | 21:00 |
| * larsks also wants a pony. | 21:00 | |
| smoser | the one thing that bzr did better. | 21:01 |
| smoser | it basically does --first-parent by default | 21:02 |
| smoser | so peopple chan have all these little silly commits, you can merge them into yours, then i can merge them into master | 21:02 |
| smoser | and if you git log on master, then you only see the one commit | 21:02 |
| smoser | as if you had squashed them all before i merged or pulled | 21:02 |
| smoser | thats why you see allthat nonsense little commits in git log now | 21:03 |
| larsks | True. Although you can also adopt a policy of "one commit per change please", and reject patches that have all those little commits. | 21:03 |
| smoser | right, but thats just squashing | 21:09 |
| smoser | and yes, i would adopt such a thing. :) | 21:09 |
| smoser | i probaly use revision control more than i should | 21:09 |
| smoser | but i really like reading history | 21:09 |
| smoser | and put a lot of stuff in it | 21:09 |
| smoser | and often would bzr log --include-merged | 21:09 |
| smoser | whenever i would say WTH WAS I THINKING! | 21:10 |
| smoser | anywahy | 21:10 |
| smoser | https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/301547 | 21:10 |
| smoser | ./packages/bddeb -S -v | 21:10 |
| smoser | that works in my branch | 21:10 |
| smoser | larsks, ^ thanks. | 21:11 |
| smoser | thats the last reference it hink to 'bzr' in the repo | 21:11 |
| smoser | that uses bzr at least | 21:12 |
| smoser | audios all | 21:14 |
| rharper | smoser: later | 21:19 |
| harlowja | what's bzr | 21:35 |
| harlowja | lol | 21:35 |
| * harlowja purges all knowledge of bzr | 21:35 | |
| harlowja | sorry canonical | 21:35 |
| harlowja | lol | 21:35 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!