Re: [Tails-dev] Please review'n'merge feature/More_uniq_built_iso_name_in_jenkins

2013-09-07 Thread intrigeri 
berta...@ptitcanardnoir.org wrote (06 Sep 2013 19:28:03 GMT) :
 Jeez, i didn't thought this commit msg was so important that it required
 to rewrite the whole history.

To my eyes, it looked like the last commit in a feature branch that
had not been merged into any branch with never rewritten history, so
it seemed trivial to fix. I'm sorry that it apparently was more
complicated in practice.

 It's done though, 

Thanks, I'll look into it later today.
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Please review'n'merge feature/More_uniq_built_iso_name_in_jenkins

2013-09-06 Thread bertagaz 
On Wed, Sep 04, 2013 at 09:02:19PM +0200, intrigeri wrote:
 (seems like I haven't sent this email yet, oh.)
 
 berta...@ptitcanardnoir.org wrote (03 Sep 2013 19:04:38 GMT) :
  All remarks have been corrected in a commit pushed in the same branch.
 
 I've tentatively merged this into my local stable, devel, experimental
  feature/wheezy, then pushed *to lizard*, and as a result the ISO
 images are named just as usual. Please test *live* on Jenkins (e.g.
 by pushing an experimental branch there) for the next iteration :)
 
 Perhaps we need to export JENKINS_URL somewhere, so that auto/build
 knows about it?

Exactly, in the build process, the `build-tails` script sudo call drops most
of the environment variables.

Fix has been commited in the dedicated branch and merged into the
experimental one (on both lizard's and origin's repo).

Build on jenkins resulted in a correct iso naming:

http://nightly.tails.boum.org/build_Tails_ISO_experimental/

Local build also named correctly the resulting iso.

Ready to be merged into the remaining branches for a final review round.

bert.
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Please review'n'merge feature/More_uniq_built_iso_name_in_jenkins

2013-09-06 Thread intrigeri 
berta...@ptitcanardnoir.org wrote (06 Sep 2013 16:15:41 GMT) :
 Ready to be merged into the remaining branches for a final review round.

I was going to merge into the other branches and push to lizard, but
I'll let you turn the (obviously temporary) message of commit 500710
into something meaningful first :)

Cheers,
-- 
  intrigeri
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Please review'n'merge feature/More_uniq_built_iso_name_in_jenkins

2013-09-06 Thread bertagaz 
On Fri, Sep 06, 2013 at 08:30:45PM +0200, intrigeri wrote:
 berta...@ptitcanardnoir.org wrote (06 Sep 2013 16:15:41 GMT) :
  Ready to be merged into the remaining branches for a final review round.
 
 I was going to merge into the other branches and push to lizard, but
 I'll let you turn the (obviously temporary) message of commit 500710
 into something meaningful first :)

Jeez, i didn't thought this commit msg was so important that it required
to rewrite the whole history. It's done though, but means that the
experimental and feature branches histories are heavily rewritten. Please
hard reset on $ORIGIN. :)


bert.
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Please review'n'merge feature/More_uniq_built_iso_name_in_jenkins

2013-09-04 Thread intrigeri 
(seems like I haven't sent this email yet, oh.)

berta...@ptitcanardnoir.org wrote (03 Sep 2013 19:04:38 GMT) :
 All remarks have been corrected in a commit pushed in the same branch.

I've tentatively merged this into my local stable, devel, experimental
 feature/wheezy, then pushed *to lizard*, and as a result the ISO
images are named just as usual. Please test *live* on Jenkins (e.g.
by pushing an experimental branch there) for the next iteration :)

Perhaps we need to export JENKINS_URL somewhere, so that auto/build
knows about it?

Cheers,
-- 
  intrigeri
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Please review'n'merge feature/More_uniq_built_iso_name_in_jenkins

2013-09-03 Thread intrigeri 
Hi,

berta...@ptitcanardnoir.org wrote (02 Sep 2013 10:59:48 GMT) :
 Branch: feature/More_uniq_built_iso_name_in_jenkins
 Ticket: #6248 (https://labs.riseup.net/code/issues/6248)

 64f39f1 Use more unique iso name when building from jenkins.

 This commit introduces more unique iso name when building in jenkins so
 that we will be able to keep several isos per day in our CI environment.

Yeah :)

 +# * if jenkins build from a branch: 
 tails-$ARCH-$BRANCH-$VERSION-$COMMIT-$TIME.iso

s/jenkins/Jenkins/
s/build/builds/ for consistency with the above lines.

 +if [ ! -z $JENKINS_URL ]; then

`! -z' can simply be called `-n'.

 +
 BUILD_BASENAME=tails-${LB_ARCHITECTURE}-${CLEAN_GIT_BRANCH}-${AMNESIA_VERSION}-${GIT_SHORT_ID}-${AMNESIA_NOW}

I'd rather see the time/date ($AMNESIA_NOW) inserted *before* the
commit ID, so that lexical sorting is still equivalent (among builds
from a given branch * version) to time-based sorting.

 +AMNESIA_NOW=`TZ=UTC date '+%Y%m%dT%H%MZ'`

`date --utc' looks more robust to me, but it surely can be debatted.

Cheers,
-- 
  intrigeri
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Please review'n'merge feature/More_uniq_built_iso_name_in_jenkins

2013-09-03 Thread bertagaz 
On Tue, Sep 03, 2013 at 08:03:48PM +0200, intrigeri wrote:
 Hi,
 
 berta...@ptitcanardnoir.org wrote (02 Sep 2013 10:59:48 GMT) :
  Branch: feature/More_uniq_built_iso_name_in_jenkins
  Ticket: #6248 (https://labs.riseup.net/code/issues/6248)
 
  64f39f1 Use more unique iso name when building from jenkins.
 
  This commit introduces more unique iso name when building in jenkins so
  that we will be able to keep several isos per day in our CI environment.
 
 Yeah :)
 
 [...]

All remarks have been corrected in a commit pushed in the same branch.
Didn't want to debate :)

bert.
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

[Tails-dev] Please review'n'merge feature/More_uniq_built_iso_name_in_jenkins

2013-09-02 Thread bertagaz 
Hi,

Branch: feature/More_uniq_built_iso_name_in_jenkins
Ticket: #6248 (https://labs.riseup.net/code/issues/6248)

64f39f1 Use more unique iso name when building from jenkins.


This commit introduces more unique iso name when building in jenkins so
that we will be able to keep several isos per day in our CI environment.

Details are in the ticket.

I've extensively tested it, by building fake 0.19 iso (modifying
debian/changelog and /etc/amnesia/version's date) and playing with the
$JENKINS_URL env variable.

This branch is based on stable and should be merged in every branches
currently build in our jenkins setup: experimental, testing and devel.
The devel branch should probably get merged again into feature/wheezy too
so that it gets the benefit of this patch.

Thanks.

Bert.
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev