apt-setup merge request on Salsa - please comment

[Holger Wansing]

Hi guys,

we got a merge request on Salsa for apt-setup, with changings to questions/
dialogs in debian-installer regarding firmware:

https://salsa.debian.org/installer-team/apt-setup/-/merge_requests/15

Could someone please review that one?
(for example, see 
https://salsa.debian.org/installer-team/apt-setup/-/merge_requests/15#note_464848
 )

Many thanks

Holger



-- 
Holger Wansing 
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

Re: debian-installer | salsa-ci: if version-skewed, use the currently available ABI version (!41)

[Philip Hands]

Cyril Brulebois  writes:

> Philip Hands  (2024-01-26):
>> Philip Hands  writes:
>> 
>> > How about using '++'?
>> 
>> After a little more thought I concluded that '+~' is marginally better,
>> so here's that alternative, just in case anyone agrees with me:
>> 
>>   
>> https://salsa.debian.org/philh/debian-installer/-/commit/f5044026b07d8dbf938394193708b33ea811ae2e
>
> Both solutions (and others in the same vein) sound specific enough that
> they shouldn't affect stable releases so feel free to pick whatever you
> like best.

Thanks & Done.

Cheers, Phil.
-- 
Philip Hands -- https://hands.com/~phil


signature.asc
Description: PGP signature

Re: debian-installer | salsa-ci: if version-skewed, use the currently available ABI version (!41)

[Cyril Brulebois]

Philip Hands  (2024-01-26):
> Philip Hands  writes:
> 
> > How about using '++'?
> 
> After a little more thought I concluded that '+~' is marginally better,
> so here's that alternative, just in case anyone agrees with me:
> 
>   
> https://salsa.debian.org/philh/debian-installer/-/commit/f5044026b07d8dbf938394193708b33ea811ae2e

Both solutions (and others in the same vein) sound specific enough that
they shouldn't affect stable releases so feel free to pick whatever you
like best.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: debian-installer | salsa-ci: if version-skewed, use the currently available ABI version (!41)

[Philip Hands]

Philip Hands  writes:

> How about using '++'?

After a little more thought I concluded that '+~' is marginally better,
so here's that alternative, just in case anyone agrees with me:

  
https://salsa.debian.org/philh/debian-installer/-/commit/f5044026b07d8dbf938394193708b33ea811ae2e

Cheers, Phil.
-- 
Philip Hands -- https://hands.com/~phil


signature.asc
Description: PGP signature

Re: debian-installer | salsa-ci: if version-skewed, use the currently available ABI version (!41)

[Philip Hands]

Hi Cyril,

Cyril Brulebois  writes:

> Hi,
>
> Philip Hands (@philh)  (2024-01-24):
>> Merge request !41 was merged
>> Merge request URL:  
>> Project:Branches: philh/debian-installer:salsa-abi-fixup to 
>> installer-team/debian-installer:master
>> Author: Philip Hands
>
> Commit 931269d99b1595725f41474e3ae00a78c9d274ae breaks builds for 
> stable branches, which are DATE+debXuY. Example on bookworm: DATE
> gets set to 20230607 instead of 20230607+deb12u4.

Ah, well spotted! :-)

I suppose one could use '+ABI' as the delimiter, instead of '+', but
that seems too specific to me.

How about using '++'?

Here's a commit to that effect:

  
https://salsa.debian.org/philh/debian-installer/-/commit/f5044026b07d8dbf938394193708b33ea811ae2e

If that looks OK to you I can push it at master (or will create an MR if
that's preferred for some reason).

Cheers, Phil.
-- 
Philip Hands -- https://hands.com/~phil


signature.asc
Description: PGP signature

Re: debian-installer | salsa-ci: if version-skewed, use the currently available ABI version (!41)

[Cyril Brulebois]

Hi,

Philip Hands (@philh)  (2024-01-24):
> Merge request !41 was merged
> Merge request URL: 
> https://salsa.debian.org/installer-team/debian-installer/-/merge_requests/41
> Project:Branches: philh/debian-installer:salsa-abi-fixup to 
> installer-team/debian-installer:master
> Author: Philip Hands

Commit 931269d99b1595725f41474e3ae00a78c9d274ae breaks builds for 
stable branches, which are DATE+debXuY. Example on bookworm: DATE
gets set to 20230607 instead of 20230607+deb12u4.

Of course that's going to be a problem for trixie onwards, but I'd
rather get that sorted out now, and not on the way to the first point
release, which is usually quite busy already.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: salsa CI

[Cyril Brulebois]

Samuel Thibault  (2024-01-23):
> The CI on salsa doesn't manage to build the debian-installer package
> because the signed linux 6.6.13 package is not available yet. Perhaps we
> should turn these build-deps:
> 
>   linux-image-6.6.13-amd64 [amd64],
>   linux-image-6.6.13-arm64 [arm64],
>   linux-image-6.6.13-686 [i386],
>   linux-image-6.6.13-686-pae [i386],
> 
> into
> 
>   linux-image-6.6.13-amd64 [amd64] | linux-image-6.6.13-amd64-unsigned 
> [amd64],
>   linux-image-6.6.13-arm64 [arm64] | linux-image-6.6.13-arm64-unsigned 
> [arm64],
>   linux-image-6.6.13-686 [i386] | linux-image-6.6.13-686-unsigned [i386],
>   linux-image-6.6.13-686-pae [i386] | linux-image-6.6.13-686-pae-unsigned 
> [i386],
> 
> ?

udebs are built from the linux-signed-* packages, so that doesn't help
at all.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)<https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: salsa CI

[Philip Hands]

Samuel Thibault  writes:

> For me it's fine for CI to fall back to the previous kernel for most
> jobs of the pipeline. I guess we'd still want a build job in the
> pipeline that sticks with the requested version, so that we notice in
> case that's not working, without breaking the entire CI pipeline.

That's a good idea -- I've done something slightly different, which is
to add an 'ABI-check' job which fails if we are in version-skew:

  
https://salsa.debian.org/philh/debian-installer/-/commit/3b862d27f3ca07e840c0f1a44e42fd26ab69b176

I think that's the finishing touch that makes me happy to merge this.

If you can tell me how the *-unsigned version of the build is actually
supposed to succeed (my attempt failed at the point where it tries to
get hold of the matching modules, where the new version was not yet
available), then I'll happily add that as an additional condition (and
will also check in the check job to see if that's what is going on).

Cheers, Phil.
-- 
Philip Hands -- https://hands.com/~phil


signature.asc
Description: PGP signature

Re: salsa CI

[Samuel Thibault]

Philip Hands, le mar. 23 janv. 2024 17:52:57 +0100, a ecrit:
> Samuel Thibault  writes:
> 
> > Philip Hands, le mar. 23 janv. 2024 16:27:12 +0100, a ecrit:
> >> Samuel Thibault  writes:
> >> 
> >> > Hello,
> >> >
> >> > The CI on salsa doesn't manage to build the debian-installer package
> >> > because the signed linux 6.6.13 package is not available yet.
> >> 
> >> Is the thing you want to:
> >>   a) be able to build d-i on salsa even when we're in version skew,
> >> or
> >>   b) do you want to be able to test with the latest version, whether it is 
> >> signed or not?
> >
> > b)
> >
> > Normally the bump in debian-installer comes about the same time as the
> > linux upload. But there is the period between the linux upload and the
> > linux-signed upload during which we don't really know whether we want to
> > bump or not. Adding the alternative between non-signed and signed as I
> > proposed would allow to be fine with either, while making sure it's the
> > signed version which is used on buildds.
> 
> Ah, fair enough.
> 
> I guess in that case I'll need to adjust what I'm doing to detect the
> available versions of kernel that I'm looking for in that patch.
> 
> If you're only worried about builds on salsa-CI, same approach as used
> in my MR ought to work,

Indeed.

It however doesn't fix the build on my laptop without some change :)

> and then one could perhaps control which kernel
> is selected via variables, or perhaps defaulting to the unsigned kernel
> (if available) would work for my use-case too, in which case I could
> just add that as a feature.
> 
> The MR's here BTW: https://deb.li/3hHY2
> 
> BTW would it actually cause you a problem for the build to work, despite
> the kernel being unavailable (e.g. by falling back to the previous
> version)?

For me it's fine for CI to fall back to the previous kernel for most
jobs of the pipeline. I guess we'd still want a build job in the
pipeline that sticks with the requested version, so that we notice in
case that's not working, without breaking the entire CI pipeline.

Samuel

Re: salsa CI

[Philip Hands]

Samuel Thibault  writes:

> Philip Hands, le mar. 23 janv. 2024 16:27:12 +0100, a ecrit:
>> Samuel Thibault  writes:
>> 
>> > Hello,
>> >
>> > The CI on salsa doesn't manage to build the debian-installer package
>> > because the signed linux 6.6.13 package is not available yet.
>> 
>> Is the thing you want to:
>>   a) be able to build d-i on salsa even when we're in version skew,
>> or
>>   b) do you want to be able to test with the latest version, whether it is 
>> signed or not?
>
> b)
>
> Normally the bump in debian-installer comes about the same time as the
> linux upload. But there is the period between the linux upload and the
> linux-signed upload during which we don't really know whether we want to
> bump or not. Adding the alternative between non-signed and signed as I
> proposed would allow to be fine with either, while making sure it's the
> signed version which is used on buildds.

Ah, fair enough.

I guess in that case I'll need to adjust what I'm doing to detect the
available versions of kernel that I'm looking for in that patch.

If you're only worried about builds on salsa-CI, same approach as used
in my MR ought to work, and then one could perhaps control which kernel
is selected via variables, or perhaps defaulting to the unsigned kernel
(if available) would work for my use-case too, in which case I could
just add that as a feature.

The MR's here BTW: https://deb.li/3hHY2

BTW would it actually cause you a problem for the build to work, despite
the kernel being unavailable (e.g. by falling back to the previous
version)?

If so, I guess a variable is required to stop that behaviour.

Cheers, Phil.
-- 
Philip Hands -- https://hands.com/~phil


signature.asc
Description: PGP signature

Re: salsa CI

[Samuel Thibault]

Philip Hands, le mar. 23 janv. 2024 16:27:12 +0100, a ecrit:
> Samuel Thibault  writes:
> 
> > Hello,
> >
> > The CI on salsa doesn't manage to build the debian-installer package
> > because the signed linux 6.6.13 package is not available yet.
> 
> Is the thing you want to:
>   a) be able to build d-i on salsa even when we're in version skew,
> or
>   b) do you want to be able to test with the latest version, whether it is 
> signed or not?

b)

Normally the bump in debian-installer comes about the same time as the
linux upload. But there is the period between the linux upload and the
linux-signed upload during which we don't really know whether we want to
bump or not. Adding the alternative between non-signed and signed as I
proposed would allow to be fine with either, while making sure it's the
signed version which is used on buildds.

Samuel

Re: salsa CI

[Philip Hands]

Samuel Thibault  writes:

> Hello,
>
> The CI on salsa doesn't manage to build the debian-installer package
> because the signed linux 6.6.13 package is not available yet.

Is the thing you want to:
  a) be able to build d-i on salsa even when we're in version skew,
or
  b) do you want to be able to test with the latest version, whether it is 
signed or not?

If what you're after a), I have a patch that does that, as you can see
here:

  https://salsa.debian.org/philh/debian-installer/-/jobs/5193962

which works by finding out the version that's actually available, and
using whatever it is (in this case, it used 6.6.11).

Cheers, Phil.
-- 
Philip Hands -- https://hands.com/~phil


signature.asc
Description: PGP signature

salsa CI

[Samuel Thibault]

Hello,

The CI on salsa doesn't manage to build the debian-installer package
because the signed linux 6.6.13 package is not available yet. Perhaps we
should turn these build-deps:

linux-image-6.6.13-amd64 [amd64],
linux-image-6.6.13-arm64 [arm64],
linux-image-6.6.13-686 [i386],
linux-image-6.6.13-686-pae [i386],

into

linux-image-6.6.13-amd64 [amd64] | linux-image-6.6.13-amd64-unsigned 
[amd64],
linux-image-6.6.13-arm64 [arm64] | linux-image-6.6.13-arm64-unsigned 
[arm64],
linux-image-6.6.13-686 [i386] | linux-image-6.6.13-686-unsigned [i386],
linux-image-6.6.13-686-pae [i386] | linux-image-6.6.13-686-pae-unsigned 
[i386],

?

Samuel

changed salsa-ci configuration for flash-kernel

[Vagrant Cascadian]

The default salsa-ci pipeline for installer-team projects has always
failed for flash-kernel, probably because flash-kernel builds no
arch:amd64 packages.

I recently merged a salsa-ci configuration from josch and switched
flash-kernel to use a a salsa-ci pipeline that used arm64 runners
instead, so that the pipelines could actually succeed.

Now I have a bunch of green checkmarks for flash-kernel, yay!

I do not know what, if anything, might be missing from this compared to
the usual salsa-ci jobs for installer projects, so I figured it was
worth mentioning here.

Holler if this change broke anything!

live well,
  vagrant


signature.asc
Description: PGP signature

Issues activated on the debian-installer project on salsa

[Cyril Brulebois]

Hi,

Since I haven't been able to find a reliable pad system over the last
few years, and since I don't quite like having pending issues in my head
or on local notes (only), I've followed zeha's nice suggestion, and
turned on issues on the debian-installer project. Then stashed the few
things that came up on IRC during the last few days:
  https://salsa.debian.org/installer-team/debian-installer/-/issues/1

Of course, the goal isn't to replace the Debian BTS. I intend to use
these issues to keep track of todolist-oriented things, like the things
we'd like to do before 12.0, but that could be used to keep track of
fixes we'd like to get into point releases:
  https://salsa.debian.org/installer-team/debian-installer/-/issues/2

Feel free to add points to those lists, maybe mentioning the reasoning
in comments if you feel the added points are not self-explanatory
enough.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Enabling salsa-CI on more installer-team repos

[Philip Hands]

Hi,

I've been working on making the salsa-CI pipeline[1] work well for
udebs, and now have it setup so that most udeb repos can have this
enabled by simply setting a configuration option[2], without needing to
touch the contents of the repository.

So far I've only done that to repos that I was working on anyway, using
that as an opportunity to make sure that the packages built and the
tests passed etc. but it's gone well in almost all cases recently, so
I'd like to roll it out more widely.

Enabling this on repos that are currently not configured to do CI is
pretty harmless, in that even if it doesn't work for a repo, it will be
no worse than the current state of not having CI running at all.

The most obvious user-visible change that would go along with this is
that people that push things to the repos will start to get emails about
the success/failure of the jobs as they run, which could amount to quite
a few emails in some cases.

Notifications about such things are something that one can tune in
gitlab, and one can use a different email address for notifications, so
they don't have to land in you inbox, or even be sent, as you prefer.

The other aspect of having CI running that's been visible is
IRC notifications to #debian-boot via KGB, which has been a bit of a
problem, because the default setup on quite a few of our repos was to
have job_event notifications selected.  This has been sitting quietly
waiting for anyone to be brave enough to add a debian/salsa-ci.yml file
to the repo. at which point every push generates a metric tonne of
drivel into the channel until someone (e.g. me ;-) ) turns it off.

This has now been fixed in a two-pronged attack:

  1) Ganneff has helpfully setup a new IRC channel where these messages
 can be sent: #di-ci

  2) Today I re-configure almost all installer-team repos to have 2 KGB
 configs, one for the normal push/merge/comment notifications, which
 still go to #debian-boot, the other sending pipeline_event messages
 (currently only success or failure messages) to #di-ci

So, the questions are:

  Is that sufficient to now permit me to enable CI for the rest of the
  installer-team repos?

  Would people prefer that was done in batches (say, 10 repos at a time)
  to see how it goes, or would you prefer to know that (pretty-much) all
  our repos will have CI enabled on them, awaiting your next push (so
  you don't need to configure it yourself)

BTW There are bound to be a few repos where the default setup doesn't
quite fit, and there needs to be a debian/salsa-ci.yml file with some
extra settings. Generally, that's things like disabling tests that were
not going to work for that repo for some reason, or telling it that the
build takes more than an hour (generally not a udeb issue).

Cheers, Phil.

[1] https://salsa.debian.org/salsa-ci-team/pipeline/
[2] Setting the 'CI/CD configuration file' option to:
   trigger_b2r.yml@installer-team/branch2repo
See:  https://wiki.debian.org/DebianInstaller/Salsa-CI
and:  https://salsa.debian.org/installer-team/branch2repo/
-- 
|)|  Philip Hands  [+44 (0)20 8530 9560]  HANDS.COM Ltd.
|-|  http://www.hands.com/http://ftp.uk.debian.org/
|(|  Hugo-Klemm-Strasse 34,   21075 Hamburg,GERMANY


signature.asc
Description: PGP signature

Bug#989473: marked as done (choose-mirror: switch mirror list from salsa to mirror-master)

[Debian Bug Tracking System]

Your message dated Sun, 17 Jul 2022 14:11:31 +0200
with message-id <20220717141131.934f60cdb142a913ff535...@mailbox.org>
and subject line Re: Bug#989473: choose-mirror: switch mirror list from salsa 
to mirror-master
has caused the Debian Bug report #989473,
regarding choose-mirror: switch mirror list from salsa to mirror-master
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
989473: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989473
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: choose-mirror
Severity: wishlist
X-Debbugs-Cc: wea...@debian.org

Filing this on behalf of Peter Palfrader who suggested we switched from
the manually curated mirror list hosted on salsa[1] to I suppose a live
one published on mirror-master[2], that would be more representative of
the current state of mirrors when release time approaches.

 1. 
https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
 2. https://mirror-master.debian.org/status/Mirrors.masterlist

Having attempted that, I'm not comfortable updating choose-mirror with
this change right now, as that would mean shuffling all entries.

A quick brainstorming on IRC resulted in what appeared to be a good idea
to everyone involved: the list might be random, but let's make sure we
show deb.d.o at the top (default entry anyway), followed by ftp.CC.d.o
(if there's such an entry for the given country).

Happy to take opinions, and possibly patches for that. :)

The trivial change to apply before running `make Mirrors.masterlist` is
in the Makefile:


-MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
+MIRRORLISTURL=https://mirror-master.debian.org/status/Mirrors.masterlist


Cheers,
-- 
Cyril Brulebois (k...@debian.org)<https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant
--- End Message ---
--- Begin Message ---
Version: 2.112


"Debian Bug Tracking System"  wrote (Fri, 20 Aug 2021 
11:27:05 +):
> Processing control commands:
> 
> > tag -1 pending
> Bug #989473 [choose-mirror] choose-mirror: switch mirror list from salsa to 
> mirror-master
> Added tag(s) pending.

This has been fixed in 2.112

Closing this bug


-- 
Holger Wansing 
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076--- End Message ---

Re: Bug#989473: choose-mirror: switch mirror list from salsa to mirror-master

[Holger Wansing]

Version: 2.112


"Debian Bug Tracking System"  wrote (Fri, 20 Aug 2021 
11:27:05 +):
> Processing control commands:
> 
> > tag -1 pending
> Bug #989473 [choose-mirror] choose-mirror: switch mirror list from salsa to 
> mirror-master
> Added tag(s) pending.

This has been fixed in 2.112

Closing this bug


-- 
Holger Wansing 
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

Bug#989473: choose-mirror: switch mirror list from salsa to mirror-master

[Peter Palfrader]

On Sat, 05 Jun 2021, Philip Hands wrote:

>  c) filter the old masterlist to only include entries that are also in
> the new list, and then use the result of that, perhaps with a tweak
> to promote deb.d.o
> 
> c) is a bit of a cludge, but seems like the only one that's got a chance
> of happening before the release, and gets most of the benefit of the new
> list.

The Type info in the salsa Masterlist is also probably not correct in
a lot of cases.

-- 
|  .''`.   ** Debian **
  Peter Palfrader   | : :' :  The  universal
 https://www.palfrader.org/ | `. `'  Operating System
|   `-https://www.debian.org/

Bug#989473: choose-mirror: switch mirror list from salsa to mirror-master

[Peter Palfrader]

On Sat, 05 Jun 2021, Philip Hands wrote:

> Philip Hands  writes:
> 
> ...
> >  c) filter the old masterlist to only include entries that are also in
> > the new list, and then use the result of that, perhaps with a tweak
> > to promote deb.d.o
> 
> BTW Promoting deb.d.o can be done thus:
> 
>   
> https://salsa.debian.org/philh/choose-mirror/-/commit/70caed09fbf4bfbcc9eca82168cf3936868d8394
> 
> which produces this menu ordering:
> 
>   https://openqa.debian.net/tests/6101#step/mirror_selection/2

And then add a line that maybe gives some number (6, 7?) to other things
matching ~/\.debian\.org$/?


-- 
|  .''`.   ** Debian **
  Peter Palfrader   | : :' :  The  universal
 https://www.palfrader.org/ | `. `'  Operating System
|   `-https://www.debian.org/

Bug#989473: choose-mirror: switch mirror list from salsa to mirror-master

[Philip Hands]

Philip Hands  writes:

...
>  c) filter the old masterlist to only include entries that are also in
> the new list, and then use the result of that, perhaps with a tweak
> to promote deb.d.o

BTW Promoting deb.d.o can be done thus:

  
https://salsa.debian.org/philh/choose-mirror/-/commit/70caed09fbf4bfbcc9eca82168cf3936868d8394

which produces this menu ordering:

  https://openqa.debian.net/tests/6101#step/mirror_selection/2

Cheers, Phil.
-- 
|)|  Philip Hands  [+44 (0)20 8530 9560]  HANDS.COM Ltd.
|-|  http://www.hands.com/http://ftp.uk.debian.org/
|(|  Hugo-Klemm-Strasse 34,   21075 Hamburg,GERMANY

Bug#989473: choose-mirror: switch mirror list from salsa to mirror-master

[Philip Hands]

Holger Wansing  writes:

> Hi,
>
> Cyril Brulebois  wrote (Fri, 04 Jun 2021 18:39:44 +0200):
>> Filing this on behalf of Peter Palfrader who suggested we switched from
>> the manually curated mirror list hosted on salsa[1] to I suppose a live
>> one published on mirror-master[2], that would be more representative of
>> the current state of mirrors when release time approaches.
>> 
>>  1. 
>> https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
>>  2. https://mirror-master.debian.org/status/Mirrors.masterlist
>
> Hmm, what exactly is the benefit?
> Sourcing a file from a git repo on Salsa seems reasonable to me, given that
> we have revision tracking there, which would be a good basis for debugging
> d-i's mirror list in case of problems or questions...

This is just changing the Makefile target that allows one to then run
`make Mirrors.masterlist` in order to update the copy of the list in the
choose-mirrors repo, so the version you care about is tracked in git.
You can see this with:

   git log | grep Update\ Mirrors.masterlist

>> Having attempted that, I'm not comfortable updating choose-mirror with
>> this change right now, as that would mean shuffling all entries.
>> 
>> A quick brainstorming on IRC resulted in what appeared to be a good idea
>> to everyone involved: the list might be random, but let's make sure we
>> show deb.d.o at the top (default entry anyway), followed by ftp.CC.d.o
>> (if there's such an entry for the given country).
>> 
>> Happy to take opinions, and possibly patches for that. :)
>
> Having deb.debian.org at the top would be an improvement, as well as having 
> ftp.CC.d.o next to it.
> However, the difference is only marginal IMHO ...

Reading the IRC chat I had assumed that reordering the masterlist might
achieve that result, but it doesn't, as a quick test showed:

  https://openqa.debian.net/tests/5976#step/mirror_selection/2

Looking at the code, the ordering is determined mostly by looking at the
Type: of the mirror:

  
https://salsa.debian.org/installer-team/choose-mirror/-/blob/master/mirrorlist#L99

which would be easy to add a line like this to:

  $rating=9 if $data[$id]->{site} eq 'deb.debian.org';

except for the slight problem that the new file is lacking almost all of
the Type: fields (it has none of the Push-Primary/Push-Secondary) stuff,
so the order you end up with is mostly based on the perl hash table
order if you use the new file, which strikes me as sub-optimal (and
explains the mess in that screenshot).

I guess we either need do one of:

 a) reinstate the Type information somehow,
which I understand is probably a problem, since the code seems to
rely on the CC mirrors having Type: Push-Primary, but since that's
actually a CNAME that may wander about maintaining that information
isn't completely straight-forward.

 b) rewrite the logic to be something like deb.d.o first, then
ftp.CC.d.o, then the rest in alphabetical order, say.

 c) filter the old masterlist to only include entries that are also in
the new list, and then use the result of that, perhaps with a tweak
to promote deb.d.o

c) is a bit of a cludge, but seems like the only one that's got a chance
of happening before the release, and gets most of the benefit of the new
list.

Cheers, Phil.
-- 
|)|  Philip Hands  [+44 (0)20 8530 9560]  HANDS.COM Ltd.
|-|  http://www.hands.com/http://ftp.uk.debian.org/
|(|  Hugo-Klemm-Strasse 34,   21075 Hamburg,GERMANY

Bug#989473: choose-mirror: switch mirror list from salsa to mirror-master

[Holger Wansing]

Hi,

Cyril Brulebois  wrote (Fri, 04 Jun 2021 18:39:44 +0200):
> Filing this on behalf of Peter Palfrader who suggested we switched from
> the manually curated mirror list hosted on salsa[1] to I suppose a live
> one published on mirror-master[2], that would be more representative of
> the current state of mirrors when release time approaches.
> 
>  1. 
> https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
>  2. https://mirror-master.debian.org/status/Mirrors.masterlist

Hmm, what exactly is the benefit?
Sourcing a file from a git repo on Salsa seems reasonable to me, given that
we have revision tracking there, which would be a good basis for debugging
d-i's mirror list in case of problems or questions...

> Having attempted that, I'm not comfortable updating choose-mirror with
> this change right now, as that would mean shuffling all entries.
> 
> A quick brainstorming on IRC resulted in what appeared to be a good idea
> to everyone involved: the list might be random, but let's make sure we
> show deb.d.o at the top (default entry anyway), followed by ftp.CC.d.o
> (if there's such an entry for the given country).
> 
> Happy to take opinions, and possibly patches for that. :)

Having deb.debian.org at the top would be an improvement, as well as having 
ftp.CC.d.o next to it.
However, the difference is only marginal IMHO ...


Holger


-- 
Holger Wansing 
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

Bug#989473: choose-mirror: switch mirror list from salsa to mirror-master

[Peter Palfrader]

On Fri, 04 Jun 2021, Holger Wansing wrote:

> Hi,
> 
> Cyril Brulebois  wrote (Fri, 04 Jun 2021 18:39:44 +0200):
> > Filing this on behalf of Peter Palfrader who suggested we switched from
> > the manually curated mirror list hosted on salsa[1] to I suppose a live
> > one published on mirror-master[2], that would be more representative of
> > the current state of mirrors when release time approaches.
> > 
> >  1. 
> > https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
> >  2. https://mirror-master.debian.org/status/Mirrors.masterlist
> 
> Hmm, what exactly is the benefit?
> Sourcing a file from a git repo on Salsa seems reasonable to me, given that
> we have revision tracking there, which would be a good basis for debugging
> d-i's mirror list in case of problems or questions...

on salsa you get all the down and broken mirrors.  on mirror-master,
they are filtered out.
-- 
|  .''`.   ** Debian **
  Peter Palfrader   | : :' :  The  universal
 https://www.palfrader.org/ | `. `'  Operating System
|   `-https://www.debian.org/

Bug#989473: choose-mirror: switch mirror list from salsa to mirror-master

[Cyril Brulebois]

Package: choose-mirror
Severity: wishlist
X-Debbugs-Cc: wea...@debian.org

Filing this on behalf of Peter Palfrader who suggested we switched from
the manually curated mirror list hosted on salsa[1] to I suppose a live
one published on mirror-master[2], that would be more representative of
the current state of mirrors when release time approaches.

 1. 
https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
 2. https://mirror-master.debian.org/status/Mirrors.masterlist

Having attempted that, I'm not comfortable updating choose-mirror with
this change right now, as that would mean shuffling all entries.

A quick brainstorming on IRC resulted in what appeared to be a good idea
to everyone involved: the list might be random, but let's make sure we
show deb.d.o at the top (default entry anyway), followed by ftp.CC.d.o
(if there's such an entry for the given country).

Happy to take opinions, and possibly patches for that. :)

The trivial change to apply before running `make Mirrors.masterlist` is
in the Makefile:


-MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
+MIRRORLISTURL=https://mirror-master.debian.org/status/Mirrors.masterlist


Cheers,
-- 
Cyril Brulebois (k...@debian.org)<https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant

Bug#736373: using this patch with salsa & openqa

[Ian Campbell]

On Wed, 2021-05-19 at 00:03 +0200, Philip Hands wrote:
Hi Ian,

Thanks for the patch. It's proven very useful while seting up pipelines on 
salsa that can be run when a udeb's git repo is pushed, such that
a mini.iso is produced that will make use of a repository containing
that udeb.

While getting that to work, I noticed that your patch does not deal well with 
the repos that aptly produces because they do not include a
Packages.xz, which means that when the Packages.xz is found in the main repo, 
it stops searching the devel repo.

That being the case, I've re-jigged things a bit, as seen here:
 
https://salsa.debian.org/philh/net-retriever/-/compare/master...extra-udeb-repo?w=1

(BTW I intend to tidy up the commits there tomorrow, as they include
some false starts at present, so probably best to wait until I've done that 
before using anything out of that branch)

Glad it was useful, I'd completely forgotten I'd even written that patch!

My knowledge of this side of things is pretty stale, but FWIW I didn't
see anything untoward in your updated diff.

Cheers,
Ian.

Bug#736373: using this patch with salsa & openqa

[Philip Hands]

Hi Ian,

Thanks for the patch. It's proven very useful while seting up pipelines
on salsa that can be run when a udeb's git repo is pushed, such that a
mini.iso is produced that will make use of a repository containing that
udeb.

While getting that to work, I noticed that your patch does not deal well
with the repos that aptly produces because they do not include a
Packages.xz, which means that when the Packages.xz is found in the main
repo, it stops searching the devel repo.

That being the case, I've re-jigged things a bit, as seen here:

  
https://salsa.debian.org/philh/net-retriever/-/compare/master...extra-udeb-repo?w=1

(BTW I intend to tidy up the commits there tomorrow, as they include
some false starts at present, so probably best to wait until I've done
that before using anything out of that branch)

Cheers, Phil.
-- 
|)|  Philip Hands  [+44 (0)20 8530 9560]  HANDS.COM Ltd.
|-|  http://www.hands.com/http://ftp.uk.debian.org/
|(|  Hugo-Klemm-Strasse 34,   21075 Hamburg,GERMANY

Re: Getting beyond hijacking, Salsa privilege

[Geert Stappers]

On Sun, Sep 06, 2020 at 02:45:49PM +0200, Camaleón wrote:
> El 2020-09-05 a las 20:30 +0200, Geert Stappers escribió:
> > On Sat, Sep 05, 2020 at 07:13:04PM +0200, Camaleón wrote:
> > > El 2020-09-05 a las 17:02 +0200, Holger Wansing escribió:
> > > > > ...
> > > > I just want to help with this conflict, please accept this help.
> > > 
  ...
> 
> > > P.S. As I already told Javier, this is the last time I translate these 
> > > files because I don't like to see my job being blatantly hijacked.
> > 
> > 
> > Acknowledge on "feeling hijacked".
> > 
> > Which ingredients has the email exchange to get beyond hijacking?
> 
> Maybe the term «hijacked» can sound strong wordings but that's how I felt.

I did recieve the "strong" words as  clear words.


> To describe it better, it happens when you have defined a way 
> to do translations in Debian Spanish, you follow the established way 
> and rules, and suddenly someone appears, gets your job, your files and 
> even without asking (this time I did not request for any help), does 
> whatever he wants, upload the files to GIT server, says there are 
> «errors» but it does not allow me, as the last translator, to make the 
> required changes, nor instructs me about where the problem lays so I
> can correct it by my own.

I do read that as Camaleón not yet having Salsa privileges
to update debian-boot translations.

@Camaleón would you be helped wiht git write access to debian-installer?

 
> In brief, acting in a dictatorial way, as he were the files' owner
> and dismissing your entire job. Well, that hurts, despite the status of 
> the person where it comes from.
> 
> > And a less retoric question:
> > What is possible for working together on the same goal?
> 
> We are all working on the same goal. There's a lot of translation work 
> to do in Debian and I'm fine translating other files; no problem on 
> my side. This episode was just the usual frictions that happens on teams 
> conformed by human people with human egos.

+1
Thanks for expressing that.

 
> So let's keep working to get the job done.

And the other jobs / tasks / duties  we have  :-)


Groeten
Geert Stappers
-- 
Silence is hard to parse

Bug#946476: marked as done (debootstrap: Additional debootstrapable image (PureOS Amber) contributed as a merge request in salsa.)

[Debian Bug Tracking System]

Your message dated Thu, 27 Feb 2020 12:49:25 +
with message-id 
and subject line Bug#946476: fixed in debootstrap 1.0.119
has caused the Debian Bug report #946476,
regarding debootstrap: Additional debootstrapable image (PureOS Amber) 
contributed as a merge request in salsa.
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
946476: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946476
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: debootstrap
Version: 1.0.116
Severity: wishlist
Tags: patch

Dear Maintainer,

In PureOS, a Free Software Foundation approved Free Software distro
based on Debian, we use a number of Debian tools. Few are more
important than debootstrap since we use that to build images for our
laptops and phone. If we could add our system definition to
debootstrap in the scripts directory, which this merge request does;
https://salsa.debian.org/installer-team/debootstrap/merge_requests/37
we would be most grateful.

Thank you!

-- System Information:
Distributor ID: PureOS
Description:PureOS
Release:10.0
Codename:   byzantium
Architecture: x86_64

Kernel: Linux 5.2.0-3-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages debootstrap depends on:
ii  wget  1.20.3-1+b2

Versions of packages debootstrap recommends:
ii  arch-test   0.16-2
ii  gnupg   2.2.17-3
ii  pureos-archive-keyring  2016.09

Versions of packages debootstrap suggests:
pn  squid-deb-proxy-client  
pn  ubuntu-archive-keyring  

-- no debconf information
--- End Message ---
--- Begin Message ---
Source: debootstrap
Source-Version: 1.0.119
Done: Hideki Yamane 

We believe that the bug you reported is fixed in the latest version of
debootstrap, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 946...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Hideki Yamane  (supplier of updated debootstrap package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Thu, 27 Feb 2020 21:16:24 +0900
Source: debootstrap
Architecture: source
Version: 1.0.119
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team 
Changed-By: Hideki Yamane 
Closes: 946476 946783
Changes:
 debootstrap (1.0.119) unstable; urgency=medium
 .
   [ Hideki Yamane ]
   * Fix: specify --foreign and --unpack-tarball at the same time
 Thanks to Cel Skeggs  for the patch (Closes: #946783)
   * Add check rule for systemd-nspawn
 .
   [ Jeremiah C. Foster ]
   * Adding PureOS 'amber' to scripts dir (Closes: #946476)
Checksums-Sha1:
 9a13ee1ae54a113dc53f0dcb9da2aadb99b15e35 1919 debootstrap_1.0.119.dsc
 bfb3eaf5a1d739ecdd78cb506e540e75fdca9649 76738 debootstrap_1.0.119.tar.gz
 6a4d94c91e6a6429b58c29c47041360ca380cc57 5935 
debootstrap_1.0.119_amd64.buildinfo
Checksums-Sha256:
 9806c467aa5297f16a72121eff52f899a2861b9d617b56f056be2f7af83a3bc3 1919 
debootstrap_1.0.119.dsc
 e6bebac0ed001a1bb44aee7076871dacdd2ceb7210fd08e449d5b2526be1b3e0 76738 
debootstrap_1.0.119.tar.gz
 46463a20a992981670897d4edc9c2bfbdfd5284088c74039920c09d3513a7ce8 5935 
debootstrap_1.0.119_amd64.buildinfo
Files:
 df65e22903cee098f5e4cda3d05ffe60 1919 admin optional debootstrap_1.0.119.dsc
 d4ea6a2aae0dc4bdb156523d42653b7e 76738 admin optional 
debootstrap_1.0.119.tar.gz
 3231fb3e7c14c0b4a31e6a0eadf9a394 5935 admin optional 
debootstrap_1.0.119_amd64.buildinfo

-BEGIN PGP SIGNATURE-

iQIzBAEBCgAdFiEEWOEiL5aWyIWjzRBMXTKNCCqqsUAFAl5XtpIACgkQXTKNCCqq
sUAFFQ//bLXBHuht+gdIdtAY7ntDX40+nKwN2R1ocgwUCmAyERVKxKhCaqf1Qh1B
srTHZtSaSSCMsds8y9o8PDeVS9OKGR3ZELDVzJig/Q2HPdHIYEAMNW/Ov6biT5q/
bTO8rjpC49kCwseTKctOzbyxZlpMRseXGNtSyF8JQQa/zhhJoxeJ1ovtch8xlnT2
pzfLvnszafp5A1YiYZ6urVExu6ykjyd2mY4Bo8i81XsI0gYN8LmRIVoWNAw7x67P
iAEsCil7YNrOG8PQDU2YaLKXo+kXk/NTHvqF5uJ/mmk+VgUALmLTdkVUBhOiI3JA
SAVZd8fXxJ3gU3xG/jNr+TJKe+svFOsIY85NngLV0DwQtYY7ixgCUkoH2eVdz9n4
MCEMJe5lp1F38680x6jT7ThBfeSyKlPmj+mHt8tutjKxurqy5BXhJI99eSimVeNh

Bug#946476: debootstrap: Additional debootstrapable image (PureOS Amber) contributed as a merge request in salsa.

[Jeremiah C. Foster]

Package: debootstrap
Version: 1.0.116
Severity: wishlist
Tags: patch

Dear Maintainer,

In PureOS, a Free Software Foundation approved Free Software distro
based on Debian, we use a number of Debian tools. Few are more
important than debootstrap since we use that to build images for our
laptops and phone. If we could add our system definition to
debootstrap in the scripts directory, which this merge request does;
https://salsa.debian.org/installer-team/debootstrap/merge_requests/37
we would be most grateful.

Thank you!

-- System Information:
Distributor ID: PureOS
Description:PureOS
Release:10.0
Codename:   byzantium
Architecture: x86_64

Kernel: Linux 5.2.0-3-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages debootstrap depends on:
ii  wget  1.20.3-1+b2

Versions of packages debootstrap recommends:
ii  arch-test   0.16-2
ii  gnupg   2.2.17-3
ii  pureos-archive-keyring  2016.09

Versions of packages debootstrap suggests:
pn  squid-deb-proxy-client  
pn  ubuntu-archive-keyring  

-- no debconf information

RE: Tajik Language Support - Debian Salsa

[victor.ibragimov]

Thank you very much!!

-Original Message-
From: Cyril Brulebois  
Sent: Friday, August 2, 2019 5:47 PM
To: victor.ibragi...@gmail.com
Cc: debian-boot@lists.debian.org
Subject: Re: Tajik Language Support - Debian Salsa

Hi Victor,

victor.ibragi...@gmail.com  (2019-08-02):
> To whom it may concern,
> 
> Hi, my name is Victor Ibragimov, a Tajik translator for Debian.
> 
> I am about to commit new Tajik translations and updates to 
> g...@salsa.debian.org:installer-team/d-i.git
> <mailto:g...@salsa.debian.org:installer-team/d-i.git>
> 
> My SSH key is set up, and it looks like I still cannot commit new 
> translations. I get this message:
> 
> > GitLab: You are not allowed to push code to this project.
> 
> fatal: Could not read from remote repository. 
> 
> Please make sure you have the correct access rights
> 
> and the repository exists. 
> 
> Could you please, check my account and grant me with access rights to 
> commit Tajik translations.
> 
> Thank you for prompt reply,
> Victor

It seems there were no pending requests to join the installer-team group
with your name on it, and you were not in the members list either. I've just
added you by picking your account (@ibragimov-guest) and adding it as a
member, which resulted in:

  Users were successfully added.

so you should be good to go. :)


Cheers,
-- 
Cyril Brulebois (k...@debian.org)<https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant

Re: Tajik Language Support - Debian Salsa

[Victor Ibragimov]

Dear Holger,

Thank you! You know it is just impossible to be away any longer. I wish I
could have much more time to translate Debian into Tajik.

Have a great weekend!
Victor

On Fri, Aug 2, 2019, 8:29 PM Holger Wansing  wrote:

> Hi,
>
>  wrote:
> > To whom it may concern,
> >
> > Hi, my name is Victor Ibragimov, a Tajik translator for Debian.
> >
> > I am about to commit new Tajik translations and updates to
> > g...@salsa.debian.org:installer-team/d-i.git
>
> Nice to hear from you again, Victor :-)
>
>
> So long
> Holger
>
>
> --
> Holger Wansing 
> PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076
>

Re: Tajik Language Support - Debian Salsa

[Holger Wansing]

Hi,

 wrote:
> To whom it may concern,
> 
> Hi, my name is Victor Ibragimov, a Tajik translator for Debian.
> 
> I am about to commit new Tajik translations and updates to
> g...@salsa.debian.org:installer-team/d-i.git

Nice to hear from you again, Victor :-)


So long
Holger


-- 
Holger Wansing 
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

Re: Tajik Language Support - Debian Salsa

[Cyril Brulebois]

Hi Victor,

victor.ibragi...@gmail.com  (2019-08-02):
> To whom it may concern,
> 
> Hi, my name is Victor Ibragimov, a Tajik translator for Debian.
> 
> I am about to commit new Tajik translations and updates to
> g...@salsa.debian.org:installer-team/d-i.git
>  
> 
> My SSH key is set up, and it looks like I still cannot commit new
> translations. I get this message:
> 
> > GitLab: You are not allowed to push code to this project.
> 
> fatal: Could not read from remote repository. 
> 
> Please make sure you have the correct access rights
> 
> and the repository exists. 
> 
> Could you please, check my account and grant me with access rights to commit
> Tajik translations.
> 
> Thank you for prompt reply,
> Victor

It seems there were no pending requests to join the installer-team group
with your name on it, and you were not in the members list either. I've
just added you by picking your account (@ibragimov-guest) and adding it
as a member, which resulted in:

  Users were successfully added.

so you should be good to go. :)


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Tajik Language Support - Debian Salsa

[victor.ibragimov]

To whom it may concern,

Hi, my name is Victor Ibragimov, a Tajik translator for Debian.

I am about to commit new Tajik translations and updates to
g...@salsa.debian.org:installer-team/d-i.git
 

My SSH key is set up, and it looks like I still cannot commit new
translations. I get this message:

> GitLab: You are not allowed to push code to this project.

fatal: Could not read from remote repository. 

Please make sure you have the correct access rights

and the repository exists. 

Could you please, check my account and grant me with access rights to commit
Tajik translations.

Thank you for prompt reply,
Victor

Re: enabling salsa-CI pipeline

[Philip Hands]

Michael Kesper  writes:

>> I'm sure there are ways of scripting the above using the gitlab API, so
>> once I've discovered how I'll think about applying similar changes to
>> all our repos -- if you already know how to prod the API, feel free to
>> tell me.
>
> Did you ask on #salsaci?

Not at all -- I was planning on doing the research when I have the time
to do the updates, and only after having given people a chance to tell
me why they hate the idea.

Cheers, Phil.
-- 
|)|  Philip Hands  [+44 (0)20 8530 9560]  HANDS.COM Ltd.
|-|  http://www.hands.com/http://ftp.uk.debian.org/
|(|  Hugo-Klemm-Strasse 34,   21075 Hamburg,GERMANY


signature.asc
Description: PGP signature

Re: enabling salsa-CI pipeline

[Michael Kesper]

Hi Phil,

On 12.07.19 15:08, Philip Hands wrote:
> Hi All,
> 
> I just configured salsa-CI pipeline for 'user-setup', and it seems to
> work, so I thought I'd say what was involved so that others can do the
> same for other bits of d-i in a similar manner ... if they get to it
> before I do (and also so I don't forget things next time I do it :-) ).
> 
> The first thing to do is configure the 'Custom CI config path' to be:

A detailed description can be found under:
https://salsa.debian.org/salsa-ci-team/pipeline

[...]
 
> I'm sure there are ways of scripting the above using the gitlab API, so
> once I've discovered how I'll think about applying similar changes to
> all our repos -- if you already know how to prod the API, feel free to
> tell me.

Did you ask on #salsaci?
Afaik there is currently no mailing list re salsa-ci.

Bye
Michael




signature.asc
Description: OpenPGP digital signature

enabling salsa-CI pipeline

[Philip Hands]

Hi All,

I just configured salsa-CI pipeline for 'user-setup', and it seems to
work, so I thought I'd say what was involved so that others can do the
same for other bits of d-i in a similar manner ... if they get to it
before I do (and also so I don't forget things next time I do it :-) ).

The first thing to do is configure the 'Custom CI config path' to be:

  debian/salsa-ci.yml

(which can be found under Settings / CI/CD / General in the web UI)

Then you should ensure that the KGB webhook isn't going to be too
chatty, by unselecting the 'Job Events' setting in the webhook.  We
probably only want to hear about the pipelines when they finish as well,
so adding this to the URL will do that:

  ;pipeline_only_status=failed;pipeline_only_status=success

(these settings are found under Settings / Integrations )

Once that's all correct, you can add the configuration file, thus:

  
https://salsa.debian.org/installer-team/user-setup/blob/f02faef05ecf63cd0817624307839401af81805b/debian/salsa-ci.yml

and you should see it pop into life in IRC.

I'm sure there are ways of scripting the above using the gitlab API, so
once I've discovered how I'll think about applying similar changes to
all our repos -- if you already know how to prod the API, feel free to
tell me.

Cheers, Phil.
-- 
|)|  Philip Hands  [+44 (0)20 8530 9560]  HANDS.COM Ltd.
|-|  http://www.hands.com/http://ftp.uk.debian.org/
|(|  Hugo-Klemm-Strasse 34,   21075 Hamburg,GERMANY


signature.asc
Description: PGP signature

Re: Import eject into Salsa

[Holger Wansing]

Hi,

Holger Wansing  wrote:
> Hi all,
> 
> is someone willing to help migrating eject source to Salsa?
> 
> Currently there is no debian repository for eject, and d-i depends on its 
> udeb.
> 
> 
> It can be imported from
> https://alioth-archive.debian.org/git/collab-maint/eject.git.tar.xz
> and should be added to 'debian' namespace on Salsa (analogous to collab-maint
> on Alioth).

Hmm, I should have CC'ed djpig as maintainer... (now done)
Even though I'm unsure if he is still that active these days... 
And I had also filed a bugreport for this already:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901714


Holger


-- 
Holger Wansing 
PGP-Finterprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

Import eject into Salsa

[Holger Wansing]

Hi all,

is someone willing to help migrating eject source to Salsa?

Currently there is no debian repository for eject, and d-i depends on its udeb.


It can be imported from
https://alioth-archive.debian.org/git/collab-maint/eject.git.tar.xz
and should be added to 'debian' namespace on Salsa (analogous to collab-maint
on Alioth).



Holger


-- 
Holger Wansing 
PGP-Finterprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

Re: Access request to Salsa d-i and installation-guide repo

[Holger Wansing]

Hi,

Am Donnerstag, 20. Dezember 2018 schrieb Javier Fernández-Sanguino Peña:
> Dear colleagues,
> 
> Could some admin of the Salsa repo's add my user (jfs) to both the d-i and
> the installation-guide projects in Salsa?

Done.

Cheers
Holger 

-- 
Sent from my Jolla phone
http://www.jolla.com/

Access request to Salsa d-i and installation-guide repo

[Javier Fernández-Sanguino Peña]

Dear colleagues,

Could some admin of the Salsa repo's add my user (jfs) to both the d-i and
the installation-guide projects in Salsa?

I used to have access previously in Alioth but my user was not moved to the
new project. I did not needed the access before, but would need it in the
coming months to update the translation into Spanish.

Thanks!

Javier



signature.asc
Description: PGP signature

Re: Access request to Salsa for Debian Installer translations (Romanian)

[Andrei POPESCU]

On Mi, 21 nov 18, 12:32:51, Cyril Brulebois wrote:
> 
> Andrei added to the d-i group, thanks.

Many thanks,
Andrei
-- 
http://wiki.debian.org/FAQsFromDebianUser


signature.asc
Description: PGP signature

Re: Access request to Salsa for Debian Installer translations (Romanian)

[Cyril Brulebois]

Hi,

Holger Wansing  (2018-11-20):
> Andrei POPESCU  wrote:
> > Hello,
> > 
> > I just sent a join request on Salsa for installer-team. I would need
> > access to update the Romanian translation of d-i, assuming I will
> > have the time to work on it (been inactive the past 3 years or so).
> 
> Translation update for Romanian would be really great. Thanks (CC'ing
> kibi for group join request)

Andrei added to the d-i group, thanks.

And Holger, I've promoted you to owner, to let you deal with such
requests because I think I had little value here, only lag. And you're
the one dealing with translators anyway.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)<https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: Access request to Salsa for Debian Installer translations (Romanian)

[Holger Levsen]

On Tue, Nov 20, 2018 at 09:44:50PM +0100, John Paul Adrian Glaubitz wrote:
> Isn’t it enough to just send pull requests with the translation updates?

it's maybe enough, but it's so much better and easier and joyful if
translaters can commit themselbes. Also it's pretty simple to review
these commits (and revoke commit rights *if* $whatever_bad. However, in
the >10 years where I've been involved in Debian Edu and where we handle
commit access very lightly (for translators and developers) I've never
experienced anything bad happening. And even if, git revoke is trivial.)

So why should we stop at "good enough" when we can do better?!! :)


-- 
cheers,
Holger

---
   holger@(debian|reproducible-builds|layer-acht).org
   PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C


signature.asc
Description: PGP signature

Re: Access request to Salsa for Debian Installer translations (Romanian)

[Holger Wansing]

Hi,

John Paul Adrian Glaubitz  wrote:
> 
> 
> > On Nov 20, 2018, at 10:54 PM, Holger Wansing  wrote:
> > 
> > Hi,
> > 
> > John Paul Adrian Glaubitz  wrote:
> >> 
> >> 
> >>> On Nov 20, 2018, at 9:42 PM, Holger Wansing  wrote:
> >>> 
> >>> Hi,
> >>> 
> >>> Andrei POPESCU  wrote:
> >>>> Hello,
> >>>> 
> >>>> I just sent a join request on Salsa for installer-team. I would need
> >>>> access to update the Romanian translation of d-i, assuming I will have
> >>>> the time to work on it (been inactive the past 3 years or so).
> >>> 
> >>> Translation update for Romanian would be really great. Thanks
> >>> (CC'ing kibi for group join request)
> >> 
> >> Isn’t it enough to just send pull requests with the translation updates?
> > 
> > I'm unsure what this means in real life:
> > translator requests to include their translation via salsa, and a team 
> > member
> > needs to accept them?
> 
> Yes, exactly this :-).

So, where is the benefit compared to the way, giving translators commit access
themself?

Of course, we limit access to the git repo, which can be considered as a pro.
But to achieve that, we need more manpower for doing the "accept pull requests"
jobs, that's the contra site.

Since manpower is always an issue on platforms like Debian, I would vote for
the "give translators commit access" way :-)


Holger




-- 
Holger Wansing 
PGP-Finterprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

Re: Access request to Salsa for Debian Installer translations (Romanian)

[John Paul Adrian Glaubitz]

> On Nov 20, 2018, at 10:54 PM, Holger Wansing  wrote:
> 
> Hi,
> 
> John Paul Adrian Glaubitz  wrote:
>> 
>> 
>>> On Nov 20, 2018, at 9:42 PM, Holger Wansing  wrote:
>>> 
>>> Hi,
>>> 
>>> Andrei POPESCU  wrote:
>>>> Hello,
>>>> 
>>>> I just sent a join request on Salsa for installer-team. I would need
>>>> access to update the Romanian translation of d-i, assuming I will have
>>>> the time to work on it (been inactive the past 3 years or so).
>>> 
>>> Translation update for Romanian would be really great. Thanks
>>> (CC'ing kibi for group join request)
>> 
>> Isn’t it enough to just send pull requests with the translation updates?
> 
> I'm unsure what this means in real life:
> translator requests to include their translation via salsa, and a team member
> needs to accept them?

Yes, exactly this :-).

Re: Access request to Salsa for Debian Installer translations (Romanian)

[Holger Wansing]

Hi,

John Paul Adrian Glaubitz  wrote:
> 
> 
> > On Nov 20, 2018, at 9:42 PM, Holger Wansing  wrote:
> > 
> > Hi,
> > 
> > Andrei POPESCU  wrote:
> >> Hello,
> >> 
> >> I just sent a join request on Salsa for installer-team. I would need
> >> access to update the Romanian translation of d-i, assuming I will have
> >> the time to work on it (been inactive the past 3 years or so).
> > 
> > Translation update for Romanian would be really great. Thanks
> > (CC'ing kibi for group join request)
> 
> Isn’t it enough to just send pull requests with the translation updates?

I'm unsure what this means in real life:
translator requests to include their translation via salsa, and a team member
needs to accept them?


Holger


-- 
Holger Wansing 
PGP-Finterprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

Re: Access request to Salsa for Debian Installer translations (Romanian)

[John Paul Adrian Glaubitz]

> On Nov 20, 2018, at 9:42 PM, Holger Wansing  wrote:
> 
> Hi,
> 
> Andrei POPESCU  wrote:
>> Hello,
>> 
>> I just sent a join request on Salsa for installer-team. I would need
>> access to update the Romanian translation of d-i, assuming I will have
>> the time to work on it (been inactive the past 3 years or so).
> 
> Translation update for Romanian would be really great. Thanks
> (CC'ing kibi for group join request)

Isn’t it enough to just send pull requests with the translation updates?

Adrian

Re: Access request to Salsa for Debian Installer translations (Romanian)

[Holger Wansing]

Hi,

Andrei POPESCU  wrote:
> Hello,
> 
> I just sent a join request on Salsa for installer-team. I would need
> access to update the Romanian translation of d-i, assuming I will have
> the time to work on it (been inactive the past 3 years or so).

Translation update for Romanian would be really great. Thanks
(CC'ing kibi for group join request)


Holger


-- 
Holger Wansing 
PGP-Finterprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

Access request to Salsa for Debian Installer translations (Romanian)

[Andrei POPESCU]

Hello,

I just sent a join request on Salsa for installer-team. I would need
access to update the Romanian translation of d-i, assuming I will have
the time to work on it (been inactive the past 3 years or so).

Thanks,
Andrei


signature.asc
Description: PGP signature

Bug#898665: marked as done ([installation-guide] change "Alioth" and "svn" to "Salsa" and "git")

[Debian Bug Tracking System]

Your message dated Sun, 23 Sep 2018 21:20:21 +
with message-id 
and subject line Bug#898665: fixed in installation-guide 20180923
has caused the Debian Bug report #898665,
regarding [installation-guide] change "Alioth" and "svn" to "Salsa" and "git"
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
898665: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898665
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: installation-guide
Severity: serious


Since the source code repository has moved from Alioth (svn repo) to Salsa
(now git), the manual needs some editing to follow this:
Alioth -> Salsa
svn -> git
and relevant URLs

It should be possible to easily sync that changes to translations as well.



So long
Holger

-- 

Created with Sylpheed 3.2.0 under the new
D E B I A N   L I N U X   7 . 0   W H E E Z Y !

Registered Linux User #311290 - https://linuxcounter.net/

--- End Message ---
--- Begin Message ---
Source: installation-guide
Source-Version: 20180923

We believe that the bug you reported is fixed in the latest version of
installation-guide, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 898...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Samuel Thibault  (supplier of updated installation-guide 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Sun, 23 Sep 2018 22:23:34 +0200
Source: installation-guide
Binary: installation-guide-amd64 installation-guide-arm64 
installation-guide-armel installation-guide-armhf installation-guide-i386 
installation-guide-mips installation-guide-mips64el installation-guide-mipsel 
installation-guide-ppc64el installation-guide-s390x
Architecture: source all
Version: 20180923
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team 
Changed-By: Samuel Thibault 
Description:
 installation-guide-amd64 - Debian installation guide for amd64
 installation-guide-arm64 - Debian installation guide for arm64
 installation-guide-armel - Debian installation guide for armel
 installation-guide-armhf - Debian installation guide for armhf
 installation-guide-i386 - Debian installation guide for i386
 installation-guide-mips - Debian installation guide for mips
 installation-guide-mips64el - Debian installation guide for mips64el
 installation-guide-mipsel - Debian installation guide for mipsel
 installation-guide-ppc64el - Debian installation guide for powerpc
 installation-guide-s390x - Debian installation guide for s390x
Closes: 615646 756859 759428 776313 784206 863868 864037 864039 898665
Changes:
 installation-guide (20180923) unstable; urgency=medium
 .
   [ Samuel Thibault ]
   * rules: Fix release name.
 .
   [ Holger Wansing ]
   * Update remaining Alioth references to dillon. Closes: #898665
   * Overhaul of 'Baking your own kernel' chapter. Closes: #784206
   * Creating bootable usb devices: link to Debian CD FAQ, on how to achieve
 this on other OS'es. Closes: #863868
   * Remove references to non-US (no longer existing for ages). Closes: #759428
   * Document how to install additional packages afterwards. Closes: #615646
   * Improve/update documentation regarding booting from USB storage.
 Closes: #756859
   * Add a warning about the use of LVM partition types. Closes: #776313
   * Reorganize chapter about "Further reading" and merge with "New to Unix"
 chapter. Closes: #864037
   * Update of "What is Debian" chapter. Closes: #864039
 .
   [ Frans Spiesschaert ]
   * Dutch translation update
Checksums-Sha1:
 b8a4d384eca1bd5b05006446330146eaa9e509b0 2844 installation-guide_20180923.dsc
 32c77674bb662a2ffa0d6c44f8bb4035fcb4f2ca 9720298 
installation-guide_20180923.tar.gz
 7dfb7ee23392e92ced3b89db0237340370d74145 16512568 
installation-guide-amd64_20180923_all.deb
 0017d3ec958ffb7a1e59c6635fd92dd48f4fffc3 15074144 
installation-guide-arm64_20180923_all.deb
 86b3ae2a9b3ebdd4

Re: Access to salsa/installation-guide

[Cyril Brulebois]

Heya,

Baptiste Jammet  (2018-08-28):
> I've just push the updated french translation, but I think I forgot to
> "git something", because the "Merge branch master..." now appears in
> the repos.
> Sorry about that...
> Can you tell me what is this "something" I miss ?

No a huge issue in any cases.

If you want to replay your local changes on top of the other changes in
the repository, you can use git pull --rebase, which will avoid creating
a merge commit. At least as far as I can tell, because I never use git
pull, and prefer to git fetch and git rebase or merge as appropriate
depending on what the situation is after the fetch.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: Access to salsa/installation-guide

[Baptiste Jammet]

Hello, 

Dixit Cyril Brulebois, le 28/08/2018 :

>You're in, welcome!

Thanks a lot.
I've just push the updated french translation, but I think I forgot to
"git something", because the "Merge branch master..." now appears in
the repos.
Sorry about that...
Can you tell me what is this "something" I miss ?

Baptiste


pgpZPkr9pyHiY.pgp
Description: Signature digitale OpenPGP

Re: Access to salsa/installation-guide

[Cyril Brulebois]

Hi Baptiste,

Baptiste Jammet  (2018-08-25):
> I'm the actual french translator for the installation guide.
> Now that I have more Debian time, I would like to have access in
> the repository to update the translation.
> My salsa account is baptiste-guest. You can find my old contributions
> in history, before May 2018.

You're in, welcome!


Cheers,
-- 
Cyril Brulebois (k...@debian.org)<https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Access to salsa/installation-guide

[Baptiste Jammet]

Hello all,

I'm the actual french translator for the installation guide.
Now that I have more Debian time, I would like to have access in
the repository to update the translation.
My salsa account is baptiste-guest. You can find my old contributions
in history, before May 2018.

Thanks
Baptiste


pgpIOzdJ2fAV3.pgp
Description: Signature digitale OpenPGP

Processed: Re: Bug#898665: [installation-guide] change "Alioth" and "svn" to "Salsa" and "git"

[Debian Bug Tracking System]

Processing control commands:

> tags -1 + pending
Bug #898665 [installation-guide] [installation-guide] change "Alioth" and "svn" 
to "Salsa" and "git"
Added tag(s) pending.

-- 
898665: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898665
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

Re: Bug#898665: [installation-guide] change "Alioth" and "svn" to "Salsa" and "git"

[Holger Wansing]

Control: tags -1 + pending


Holger Wansing  wrote:
> Package: installation-guide
> Severity: serious
> 
> 
> Since the source code repository has moved from Alioth (svn repo) to Salsa
> (now git), the manual needs some editing to follow this:
>   Alioth -> Salsa
>   svn -> git
>   and relevant URLs
> 
> It should be possible to easily sync that changes to translations as well.

Just committed.

Holger


-- 

Created with Sylpheed 3.5.1 under 
D E B I A N   L I N U X   9   " S T R E T C H " .

Registered Linux User #311290 - https://linuxcounter.net/

Re: commit rights on salsa for d-i-manual

[Cyril Brulebois]

Hi,

Holger Wansing  (2018-05-28):
> I just noted that the d-i base repo at
> https://salsa.debian.org/installer-team/d-i still refers to the old
> name in its description: ("The manual no longer lives here, see the
> d-i manual repo instead for that")

Fixed, thanks.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: commit rights on salsa for d-i-manual

[Frans Spiesschaert]

Hi,

Thank you both for the clarifications.
Updates committed.


Holger Wansing schreef op ma 28-05-2018 om 16:13 [+]:
> Hi,
> 
> Am Montag, 28. Mai 2018 schrieb Cyril Brulebois:
> > Hi,
> > 
> > Holger Wansing  (2018-05-28):
> > > > GitLab: The project you were looking for could not be found.
> > > > fatal: Could not read from remote repository.
> > 
> > Yeah, sorry about that. It took us a bit of time to get every
> > detail
> > sorted out, and a few renames/re-migration happened.
> > 
> > > Ah, something comes to mind:
> > > 
> > > The repository for the d-i-manual has been moved to another path
> > > on salsa,
> > > it now resides as "installation-guide" (it's correct name):
> > > https://salsa.debian.org/installer-team/installation-guide
> > 
> > Yeah, with the error message you quoted, checking projects
> > associated
> > with a given team might have helped you figure out the correct/new
> > name
> 
> I just noted that the d-i base repo at
> https://salsa.debian.org/installer-team/d-i
> still refers to the old name in its description:
> ("The manual no longer lives here, see the d-i manual repo instead
> for that")
> 
> Should be updated for completeness.
> I would have done that, but I am lacking permission.
> 
> Holger
> 
> 
> -- 
> Sent from my Jolla phone
> http://www.jolla.com/

-- 
Regards,
Frans Spiesschaert


signature.asc
Description: This is a digitally signed message part

Re: commit rights on salsa for d-i-manual

[Holger Wansing]

Hi,

Am Montag, 28. Mai 2018 schrieb Cyril Brulebois:
> Hi,
> 
> Holger Wansing <li...@wansing-online.de> (2018-05-28):
> > > GitLab: The project you were looking for could not be found.
> > > fatal: Could not read from remote repository.
> 
> Yeah, sorry about that. It took us a bit of time to get every detail
> sorted out, and a few renames/re-migration happened.
> 
> > Ah, something comes to mind:
> > 
> > The repository for the d-i-manual has been moved to another path on salsa,
> > it now resides as "installation-guide" (it's correct name):
> > https://salsa.debian.org/installer-team/installation-guide
> 
> Yeah, with the error message you quoted, checking projects associated
> with a given team might have helped you figure out the correct/new name

I just noted that the d-i base repo at
https://salsa.debian.org/installer-team/d-i
still refers to the old name in its description:
("The manual no longer lives here, see the d-i manual repo instead for that")

Should be updated for completeness.
I would have done that, but I am lacking permission.

Holger


-- 
Sent from my Jolla phone
http://www.jolla.com/

Re: commit rights on salsa for d-i-manual

[Cyril Brulebois]

Hi,

Holger Wansing <li...@wansing-online.de> (2018-05-28):
> > GitLab: The project you were looking for could not be found.
> > fatal: Could not read from remote repository.

Yeah, sorry about that. It took us a bit of time to get every detail
sorted out, and a few renames/re-migration happened.

> Ah, something comes to mind:
> 
> The repository for the d-i-manual has been moved to another path on salsa,
> it now resides as "installation-guide" (it's correct name):
> https://salsa.debian.org/installer-team/installation-guide

Yeah, with the error message you quoted, checking projects associated
with a given team might have helped you figure out the correct/new name
on your own, but I see how this can be confusing.

> So you have an outdated checkout, which no longer works.
> 
> You need to do a new git clone from
> g...@salsa.debian.org:installer-team/installation-guide.git

FWIW with git, just updating the remote might be sufficient, instead of
cloning everything again. But as I said, I think we re-run the migration
scripts a few times, so maybe the current repository has a different set
of branches/history compared to your clone. Updating the remote's URL
might be worth a try though. ;)

Sorry for the inconvience, and feel free to keep me in the loop (through
a personal cc) in case you still have issues with committing, we'll try
to fix it up ASAP.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)<https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: commit rights on salsa for d-i-manual

[Holger Wansing]

Hi,

Frans Spiesschaert <frans.spiesscha...@yucom.be> wrote:
> Hi Holger,
> 
> Holger Wansing schreef op zo 27-05-2018 om 07:20 [+]:
> > Hi,
> > 
> > Am Samstag, 26. Mai 2018 schrieb Frans Spiesschaert:
> > > Hi,
> > > 
> > > I am the actual maintainer of the Dutch translation of the Debian
> > > Installation Guide. I prepared translation updates for the chapters
> > > boot-installer.po and using-d-i.po.
> > > I have commit rights on salsa for d-i as frans-guest in order to
> > > keep
> > > the Dutch translation of the installer up to date.
> > > Can I have commit rights on salsa for d-i-manual to?
> > 
> > That has been done already 2 weeks ago, as far as I can see.
> 
> For d-i indeed, but I suppose not for d-i-manual.
> 
> > Did you try it? Or were there any problems? 
> 
> I tried yesterday to push my updates for po/nl/boot-installer.po
> and another time just a while ago, but I get the following failure:
> 
> GitLab: The project you were looking for could not be found.
> fatal: Could not read from remote repository.

Ah, something comes to mind:

The repository for the d-i-manual has been moved to another path on salsa,
it now resides as "installation-guide" (it's correct name):
https://salsa.debian.org/installer-team/installation-guide

So you have an outdated checkout, which no longer works.

You need to do a new git clone from
g...@salsa.debian.org:installer-team/installation-guide.git


Holger


-- 

Created with Sylpheed 3.5.1 under 
D E B I A N   L I N U X   9   " S T R E T C H " .

Registered Linux User #311290 - https://linuxcounter.net/

Re: commit rights on salsa for d-i-manual

[Frans Spiesschaert]

Hi Holger,

Holger Wansing schreef op zo 27-05-2018 om 07:20 [+]:
> Hi,
> 
> Am Samstag, 26. Mai 2018 schrieb Frans Spiesschaert:
> > Hi,
> > 
> > I am the actual maintainer of the Dutch translation of the Debian
> > Installation Guide. I prepared translation updates for the chapters
> > boot-installer.po and using-d-i.po.
> > I have commit rights on salsa for d-i as frans-guest in order to
> > keep
> > the Dutch translation of the installer up to date.
> > Can I have commit rights on salsa for d-i-manual to?
> 
> That has been done already 2 weeks ago, as far as I can see.

For d-i indeed, but I suppose not for d-i-manual.

> Did you try it? Or were there any problems? 

I tried yesterday to push my updates for po/nl/boot-installer.po
and another time just a while ago, but I get the following failure:

GitLab: The project you were looking for could not be found.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

> 
> Holger
> 
> -- 
> Sent from my Jolla phone
> http://www.jolla.com/

-- 
Regards,
Frans Spiesschaert


signature.asc
Description: This is a digitally signed message part

Re: commit rights on salsa for d-i-manual

[Holger Wansing]

Hi,

Am Samstag, 26. Mai 2018 schrieb Frans Spiesschaert:
> Hi,
> 
> I am the actual maintainer of the Dutch translation of the Debian
> Installation Guide. I prepared translation updates for the chapters
> boot-installer.po and using-d-i.po.
> I have commit rights on salsa for d-i as frans-guest in order to keep
> the Dutch translation of the installer up to date.
> Can I have commit rights on salsa for d-i-manual to?

That has been done already 2 weeks ago, as far as I can see.
Did you try it? Or were there any problems? 

Holger

-- 
Sent from my Jolla phone
http://www.jolla.com/

commit rights on salsa for d-i-manual

[Frans Spiesschaert]

Hi,

I am the actual maintainer of the Dutch translation of the Debian
Installation Guide. I prepared translation updates for the chapters
boot-installer.po and using-d-i.po.
I have commit rights on salsa for d-i as frans-guest in order to keep
the Dutch translation of the installer up to date.
Can I have commit rights on salsa for d-i-manual to?

-- 
Regards,
Frans Spiesschaert


signature.asc
Description: This is a digitally signed message part

Re: tasksel migration to Salsa

[Steve McIntyre]

On Tue, May 22, 2018 at 10:15:14PM +0200, Cyril Brulebois wrote:
>Hi,
>
>Steve McIntyre  (2018-05-22):
>> Hmmm - odd that it wasn't picked up when I migrated all the other
>> modules for d-i. Oh (checking) because it's not in the d-i directory.
>> I'm thinking we should probably fix that.
>> 
>> KiBi, thoughts?
>
>The d-i/tasksel distinction never really made sense to me (maybe it was
>to grant people access differenty through both projects at some point of
>a distant past)? Anyway, I think it'd make sense to welcome it under the
>installer-team umbrella.

Done. It's now set up just the same as the other installer-team
repos. I've disabled the alioth repo with a hook, added a kgb webhook
etc.

Just updating the redirect for git.d.o now.

Hugh - thanks for noticing and mentioning this!

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
"I've only once written 'SQL is my bitch' in a comment. But that code 
 is in use on a military site..." -- Simon Booth

Re: tasksel migration to Salsa

[Cyril Brulebois]

Hi,

Steve McIntyre  (2018-05-22):
> Hmmm - odd that it wasn't picked up when I migrated all the other
> modules for d-i. Oh (checking) because it's not in the d-i directory.
> I'm thinking we should probably fix that.
> 
> KiBi, thoughts?

The d-i/tasksel distinction never really made sense to me (maybe it was
to grant people access differenty through both projects at some point of
a distant past)? Anyway, I think it'd make sense to welcome it under the
installer-team umbrella.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: tasksel migration to Salsa

[Steve McIntyre]

On Tue, May 22, 2018 at 01:46:13PM +, Hugh McMaster wrote:
>Hi,
>
>Could someone please migrate ‘tasksel’ to Salsa? It is still on Alioth.

Hmmm - odd that it wasn't picked up when I migrated all the other
modules for d-i. Oh (checking) because it's not in the d-i
directory. I'm thinking we should probably fix that.

KiBi, thoughts?

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
"Yes, of course duct tape works in a near-vacuum. Duct tape works
 anywhere. Duct tape is magic and should be worshipped."
   -― Andy Weir, "The Martian"

tasksel migration to Salsa

[Hugh McMaster]

Hi,

Could someone please migrate ‘tasksel’ to Salsa? It is still on Alioth.

Thank you,

Hugh

Bug#898665: [installation-guide] change "Alioth" and "svn" to "Salsa" and "git"

[Holger Wansing]

Package: installation-guide
Severity: serious


Since the source code repository has moved from Alioth (svn repo) to Salsa
(now git), the manual needs some editing to follow this:
Alioth -> Salsa
svn -> git
and relevant URLs

It should be possible to easily sync that changes to translations as well.



So long
Holger

-- 

Created with Sylpheed 3.2.0 under the new
D E B I A N   L I N U X   7 . 0   W H E E Z Y !

Registered Linux User #311290 - https://linuxcounter.net/

Re: Salsa

[Steve McIntyre]

On Sun, May 13, 2018 at 05:14:49PM +0100, Steve McIntyre wrote:
>On Sun, May 13, 2018 at 06:05:53PM +0200, Cyril Brulebois wrote:
>
>>Can't we just go for that instead, which would have the benefit of
>>matching the source package name?
>>  https://salsa.debian.org/installer-team/installation-guide
>
>Good call, yes. That makes much more sense. I'll happily move it if
>you like, unless you'd rather...?

I've done it, as agreed in irc.

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
"Further comment on how I feel about IBM will appear once I've worked out
 whether they're being malicious or incompetent. Capital letters are forecast."
 Matthew Garrett, http://www.livejournal.com/users/mjg59/30675.html

Re: Salsa

[Steve McIntyre]

On Sun, May 13, 2018 at 06:05:53PM +0200, Cyril Brulebois wrote:
>Hey,
>
>Looking at names…
>
>Steve McIntyre  (2018-05-09):
>> Yup. In fact, at this point I declare the conversion to be as done as
>> it's going to be. I've just imported these test repos into the
>> installer-team area:
>> 
>>  https://salsa.debian.org/installer-team/d-i
>
>I guess this is fair, even if people might confuse that with the
>(real) debian-installer package/repository.

ACK.

>>  https://salsa.debian.org/installer-team/di-i-manual
>
>This seems to be named this way, now?
>  https://salsa.debian.org/installer-team/d-i-manual

Gah, yes - the name I wrote there was a typo!

>Can't we just go for that instead, which would have the benefit of
>matching the source package name?
>  https://salsa.debian.org/installer-team/installation-guide

Good call, yes. That makes much more sense. I'll happily move it if
you like, unless you'd rather...?

>>  https://salsa.debian.org/installer-team/di-i-archive
>
>Apparently named https://salsa.debian.org/installer-team/d-i-archive
>now, which looks fine if we keep the d-i name for the old svn top-level
>(see first point).

Again, same typo. Late night cut and paste... :-)

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
  Getting a SCSI chain working is perfectly simple if you remember that there
  must be exactly three terminations: one on one end of the cable, one on the
  far end, and the goat, terminated over the SCSI chain with a silver-handled
  knife whilst burning *black* candles. --- Anthony DeBoer

Re: Salsa

[Cyril Brulebois]

Hey,

Looking at names…

Steve McIntyre  (2018-05-09):
> Yup. In fact, at this point I declare the conversion to be as done as
> it's going to be. I've just imported these test repos into the
> installer-team area:
> 
>  https://salsa.debian.org/installer-team/d-i

I guess this is fair, even if people might confuse that with the
(real) debian-installer package/repository.

>  https://salsa.debian.org/installer-team/di-i-manual

This seems to be named this way, now?
  https://salsa.debian.org/installer-team/d-i-manual

Can't we just go for that instead, which would have the benefit of
matching the source package name?
  https://salsa.debian.org/installer-team/installation-guide

>  https://salsa.debian.org/installer-team/di-i-archive

Apparently named https://salsa.debian.org/installer-team/d-i-archive
now, which looks fine if we keep the d-i name for the old svn top-level
(see first point).


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: commit rights to d-i on salsa

[Holger Wansing]

Hi,

Am Donnerstag, 10. Mai 2018 schrieb Holger Wansing:
> Hi,
> 
> Am Donnerstag, 10. Mai 2018 schrieb YunQiang Su:
> > Please add me, s...@debian.org also.
> > I work on zh_CN translation.
> 
> Basically, that would be no problem.
> However, the Chinese translators have decided to use the Weblate
> frontend for translation work.
> Would you be comfortable using it too?
> https://hosted.weblate.org/projects/debian-installer/

Please note, that Chinese translations are complete at
Weblate currently, so there is no work to be done for 
Chinese at the moment.

Holger 

-- 
Sent from my Jolla phone
http://www.jolla.com/

Re: commit rights to d-i on salsa

[Helge Deller]

On 10.05.2018 12:54, Steve McIntyre wrote:
> On Thu, May 10, 2018 at 12:26:52PM +0200, Holger Wansing wrote:
>> Frans Spiesschaert  wrote:
>> And me too :-) Somehow I had the impression, that I am already a member, but
>> I am not.
> 
> Done, for all 3.

Can you please add me as well?
deller-guest

Thanks,
Helge

Re: commit rights to d-i on salsa

[Holger Wansing]

Hi,

Am Donnerstag, 10. Mai 2018 schrieb YunQiang Su:
> Please add me, s...@debian.org also.
> I work on zh_CN translation.

Basically, that would be no problem.
However, the Chinese translators have decided to use the Weblate
frontend for translation work.
Would you be comfortable using it too?
https://hosted.weblate.org/projects/debian-installer/

Holger 

-- 
Sent from my Jolla phone
http://www.jolla.com/

Re: commit rights to d-i on salsa

[Geert Stappers]

On Thu, May 10, 2018 at 10:42:07PM +0800, YunQiang Su wrote:
> Please add me, s...@debian.org also.

Visit https://salsa.debian.org/installer-team
and click on 'Request Access'

Debian Developers get instant access.


Cheers
Geert Stappers
DD

Re: commit rights to d-i on salsa

[Steve McIntyre]

On Thu, May 10, 2018 at 10:42:07PM +0800, YunQiang Su wrote:
>Please add me, s...@debian.org also.
>I work on zh_CN translation.

Done!

Any more? :-)

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
Who needs computer imagery when you've got Brian Blessed?

Re: commit rights to d-i on salsa

[YunQiang Su]

Please add me, s...@debian.org also.
I work on zh_CN translation.

On Thu, May 10, 2018 at 7:04 PM, Holger Wansing <li...@wansing-online.de> wrote:
> Hi,
>
> Steve McIntyre <st...@einval.com> wrote:
>> On Thu, May 10, 2018 at 12:26:52PM +0200, Holger Wansing wrote:
>> >Frans Spiesschaert <frans.spiesscha...@yucom.be> wrote:
>> >>
>> >> Paul's account name is elbrus. He is a DD.
>> >
>> >So, please add Paul (elbrus) and Frans (frans-guest) to the installer team
>> >on salsa.
>> >And me too :-) Somehow I had the impression, that I am already a member, but
>> >I am not.
>>
>> Done, for all 3.
>
> That was quick! :-)
>
> And it works for me. Thanks
>
> Holger
>
>
> --
> 
> Created with Sylpheed 3.5.1 under
> D E B I A N   L I N U X   9   " S T R E T C H " .
>
> Registered Linux User #311290 - https://linuxcounter.net/
> 
>



-- 
YunQiang Su

Re: commit rights to d-i on salsa

[Holger Wansing]

Hi,

Steve McIntyre <st...@einval.com> wrote:
> On Thu, May 10, 2018 at 12:26:52PM +0200, Holger Wansing wrote:
> >Frans Spiesschaert <frans.spiesscha...@yucom.be> wrote:
> >> 
> >> Paul's account name is elbrus. He is a DD.
> >
> >So, please add Paul (elbrus) and Frans (frans-guest) to the installer team 
> >on salsa.
> >And me too :-) Somehow I had the impression, that I am already a member, but
> >I am not.
> 
> Done, for all 3.

That was quick! :-)

And it works for me. Thanks

Holger


-- 

Created with Sylpheed 3.5.1 under 
D E B I A N   L I N U X   9   " S T R E T C H " .

Registered Linux User #311290 - https://linuxcounter.net/

Re: commit rights to d-i on salsa

[Steve McIntyre]

On Thu, May 10, 2018 at 12:26:52PM +0200, Holger Wansing wrote:
>Frans Spiesschaert <frans.spiesscha...@yucom.be> wrote:
>> 
>> Paul's account name is elbrus. He is a DD.
>
>So, please add Paul (elbrus) and Frans (frans-guest) to the installer team 
>on salsa.
>And me too :-) Somehow I had the impression, that I am already a member, but
>I am not.

Done, for all 3.

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
"We're the technical experts.  We were hired so that management could
 ignore our recommendations and tell us how to do our jobs."  -- Mike Andrews

Re: commit rights to d-i on salsa

[Holger Wansing]

Hi,

Frans Spiesschaert <frans.spiesscha...@yucom.be> wrote:
> Hi,
> 
> Holger Wansing schreef op do 10-05-2018 om 09:12 [+0200]:
> > Hi,
> > 
> > Frans Spiesschaert <frans.spiesscha...@yucom.be> wrote:
> > > Hi Holger,
> > > 
> > > In the past Paul Gevers used to commit my translation updates for
> > > d-i.
> > > But since d-i moved to salsa, he lacks commit rights to d-i for the
> > > moment.
> > > So could you please commit d-i/packages/po/sublevel3/nl.po on my
> > > behalf. I attached it to this email.
> > > I have a guest-account (frans-guest) on salsa, so I could commit
> > > translation updates myself if I would gain commit rights, but I'm
> > > also
> > > perfectly fine with you committing translation updates on my
> > > behalf.
> > 
> > I will commit it, sure.
> > 
> > In the long term, we should provide you both with commit rights.
> > So, please add Paul's account name, and forward this to
> > debian-boot@lists.debian.org, to gain commit rights for your both.
> 
> Paul's account name is elbrus. He is a DD.

So, please add Paul (elbrus) and Frans (frans-guest) to the installer team 
on salsa.
And me too :-) Somehow I had the impression, that I am already a member, but
I am not.


Holger


-- 
Holger Wansing <hwans...@mailbox.org>
PGP-Finterprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076

commit rights to d-i on salsa (Re: Dutch translation update for d-i/packages/po/sublevel3/nl.po)

[Frans Spiesschaert]

Hi,

Holger Wansing schreef op do 10-05-2018 om 09:12 [+0200]:
> Hi,
> 
> Frans Spiesschaert <frans.spiesscha...@yucom.be> wrote:
> > Hi Holger,
> > 
> > In the past Paul Gevers used to commit my translation updates for
> > d-i.
> > But since d-i moved to salsa, he lacks commit rights to d-i for the
> > moment.
> > So could you please commit d-i/packages/po/sublevel3/nl.po on my
> > behalf. I attached it to this email.
> > I have a guest-account (frans-guest) on salsa, so I could commit
> > translation updates myself if I would gain commit rights, but I'm
> > also
> > perfectly fine with you committing translation updates on my
> > behalf.
> 
> I will commit it, sure.
> 
> In the long term, we should provide you both with commit rights.
> So, please add Paul's account name, and forward this to
> debian-boot@lists.debian.org, to gain commit rights for your both.

Paul's account name is elbrus. He is a DD.

> 
> 
> Thanks
> Holger
> 

-- 
Regards,
Frans Spiesschaert


signature.asc
Description: This is a digitally signed message part

Re: Salsa

[Cyril Brulebois]

Steve McIntyre <st...@einval.com> (2018-05-09):
> AFAICS we still need to (in rough order):
> 
>  1. Disable svn commits
> 
>  2. Tweak the translation workflow to push changes to
>  d-i.git/packages/po, instead of d-i in svn.
> 
>  3. Change the checkouts of d-i on the buildds etc. to use git?

I don't think we have svn checkouts anywhere but dillon. There's nothing
on buildds since we're building d-i from porterboxes. Thinking of it,
they need manual pointing to salsa, and I don't think latest builds
reflected what was in master… I'll go and do that now.

>  4. Update docs to point to the new repos
> 
> Anything else?

Docs are a big part of this transition, especially for translators.
We'll need appropriate communication and possibly hand holding… That
might put a heavy burden on translation coordinators (see Christian's
fears regarding this big transition, and the historical reluctance to
moving off of svn).


Cheers,
-- 
Cyril Brulebois (k...@debian.org)<https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Re: Salsa

[Steve McIntyre]

On Sun, May 06, 2018 at 04:56:49PM +0100, Ian Campbell wrote:
>On Sun, 2018-05-06 at 01:43 +0100, Steve McIntyre wrote:
>> OK, so I've tried --aggressive too now, and wow does it make a big
>> difference.
>
>AIUI amongst other things --aggressive forces a full repack of the
>repo, which optimises the delta compression in the pack files. You
>could probably achieve most of the effect with `git repack`. It's
>probably diminishing returns at this point but there are options there
>to make it spend (lots) more time/memory to make things even smaller.

Yup.

>
>>  I've tried using it on the d-i.git and d-i-manual.git
>> repos and the difference is *huge*:
>> 
>> # test2, previous results:
>> $ du -s test*
>> 613888  test1-bare.git
>> 3653432 test2-bare.git
>> 714336  test2-manual-bare.git

$ du -s test4-*
138500  test4-archive-bare.git
174504  test4-bare.git
38112   test4-manual-bare.git

>That's much better ;-)

Yup. In fact, at this point I declare the conversion to be as done as
it's going to be. I've just imported these test repos into the
installer-team area:

 https://salsa.debian.org/installer-team/d-i
 https://salsa.debian.org/installer-team/di-i-manual
 https://salsa.debian.org/installer-team/di-i-archive

I've got a local backup of the svn repos still, and I'll keep them for
a while so if we find I've screwed up we can still recover. I'll keep
these for a couple of months.

I've just added the one commit that's happened in the last week
(r71079 from Holger), and all seems good. I'm just about to add my
changes for .mrconfig etc. now.

AFAICS we still need to (in rough order):

 1. Disable svn commits

 2. Tweak the translation workflow to push changes to
 d-i.git/packages/po, instead of d-i in svn.

 3. Change the checkouts of d-i on the buildds etc. to use git?
 
 4. Update docs to point to the new repos

Anything else?

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
Can't keep my eyes from the circling sky,
Tongue-tied & twisted, Just an earth-bound misfit, I...

Re: Salsa

[Ian Campbell]

On Sun, 2018-05-06 at 01:43 +0100, Steve McIntyre wrote:
> OK, so I've tried --aggressive too now, and wow does it make a big
> difference.

AIUI amongst other things --aggressive forces a full repack of the
repo, which optimises the delta compression in the pack files. You
could probably achieve most of the effect with `git repack`. It's
probably diminishing returns at this point but there are options there
to make it spend (lots) more time/memory to make things even smaller.

>  I've tried using it on the d-i.git and d-i-manual.git
> repos and the difference is *huge*:
> 
> # test2, previous results:
> $ du -s test*
> 613888  test1-bare.git
> 3653432 test2-bare.git
> 714336  test2-manual-bare.git

That's much better ;-)

Ian.

Re: Salsa

[Steve McIntyre]

On Fri, May 04, 2018 at 05:27:47PM +0100, Steve McIntyre wrote:
>On Fri, May 04, 2018 at 05:21:53PM +0100, Ian Campbell wrote:
>
>>If it was a different tool maybe a `git gc --aggressive` will repack
>>(and thus compact/delta-compress) the bigger one? (my hypothesis is
>>that maybe the first run did it automatically and the second didn't)
>
>ACK, that was my initial thought. The first tool does a "git gc" after
>each revision has been converted. The second one doesn't. But I did
>"git gc" and "git repack -a -d" on the second afterwards. It reduced
>from ~3.8G to the ~3.5G you see here.

OK, so I've tried --aggressive too now, and wow does it make a big
difference. I've tried using it on the d-i.git and d-i-manual.git
repos and the difference is *huge*:

# test2, previous results:
$ du -s test*
613888  test1-bare.git
3653432 test2-bare.git
714336  test2-manual-bare.git

# test3, bare clones from new repos after git gc --aggressive:
$ du -s test3-*
261408  test3-bare.git
37908   test3-manual-bare.git

I've continued on and added an extra d-i-archive.git repo, splitting
out lots of older stuff that's already been split into new repos as
Bastian said (see attached config). After "git gc --aggressive" on
each and a bare clone, I now get:

$ du -s test4-*
138500  test4-archive-bare.git
174504  test4-bare.git
38112   test4-manual-bare.git

I think we're getting much closer to a reasonable solution here! I've
uploaded each of these to salsa again, in case anybody else would like
to play with them:

https://salsa.debian.org/93sam/d-i-test4-archive.git
https://salsa.debian.org/93sam/d-i-test4.git
https://salsa.debian.org/93sam/d-i-test4-manual.git

I've not yet applied my patch to d-i-test4.git to allow for building -
see attached.

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
< sladen> I actually stayed in a hotel and arrived to find a post-it
  note stuck to the mini-bar saying "Paul: This fridge and
  fittings are the correct way around and do not need altering"
#
# Declare the repositories we know about:
#

create repository d-i.git
end repository

create repository d-i-manual.git
end repository

create repository d-i-archive.git
end repository

#
# Declare the rules
# Note: rules must end in a slash
#

# Ignore this dir:
# Note that rules are applied in order of appearance, so this rule
# must appear before the generic rules
match /people/
end match

match /README
end match

# Split out the manual
match /trunk/manual/
  repository d-i-manual.git
  branch master
end match
match /branches/([^/]+)/manual/
  repository d-i-manual.git
  branch \1
end match
match /tags/([^/]+)/manual/
  repository d-i-manual.git
  branch refs/tags/\1
end match

# /scripts/ and /packages/po/ belong in the main repo
match /trunk/(doc|scripts|packages/po)/
  repository d-i.git
  branch master
  prefix \1/
end match
match /branches/([^/]+)/(doc|scripts|packages/po)/
  repository d-i.git
  branch \1
  prefix \2/
end match
match /tags/([^/]+)/(doc|scripts|packages/po)/
  repository d-i.git
  branch refs/tags/\1
  prefix \2/
end match

# Grab out all of the old content that's now been split ouy to
# separate modules, including anything else under /packages/ that
# we've not already grabbed in /packages/po/
match 
/trunk/(anna|build|doc|installer|kernel.*|lib.*|main-menu|netboot.*|packages-build|partman|retriever|rootskel|tools|utils|win32-loader|packages)/
  repository d-i-archive.git
  branch master
  prefix \1/
end match
match 
/branches/([^/]+)/(anna|build|doc|installer|kernel.*|lib.*|main-menu|netboot.*|packages-build|partman|retriever|rootskel|tools|utils|win32-loader|packages)/
  repository d-i-archive.git
  branch \1
  prefix \2/
end match
match 
/tags/([^/]+)/(anna|build|doc|installer|kernel.*|lib.*|main-menu|netboot.*|packages-build|partman|retriever|rootskel|tools|utils|win32-loader|packages)/
  repository d-i-archive.git
  branch refs/tags/\1
  prefix \2/
end match

# Finally, anything else goes in the main repo. This should also pick up
# bare files like /README and .mrconfig
match /trunk/
  repository d-i.git
  branch master
end match
match /branches/([^/]+)/
  repository d-i.git
  branch \1
end match
match /tags/([^/]+)/
  repository d-i.git
  branch refs/tags/\1
end match

#
#match /project2/trunk/
#  repository project2
#  branch master
#end match
#
# Note how we can use regexp to capture the repository name
#match /([^/]+)/branches/([^/]+)/
#  repository \1
#  branch \2
#end match

# No tag processing
>From bb1df3b30ca83634b9fedb12fb32fb1244c11d9b Mon Sep 17 00:00:00 2001
From: Steve McIntyre <st...@einval.com>
Date: Fri, 4 May 2018 14:47:17 +0100
Subject: [PATCH] Tweaks for git on salsa

---
 .mrconfig |  2 +-
 scripts/git-setup | 19 ++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.mrconfig b/.mrconfig
inde

Re: Salsa

[Steve McIntyre]

On Fri, May 04, 2018 at 05:21:53PM +0100, Ian Campbell wrote:
>On Thu, 2018-05-03 at 22:10 +0100, Steve McIntyre wrote:
>> The outputs from this run
>> were a surprising amount bigger than my first test repo, as the
>> following bare clones from each will show:
>> 
>> tack:/tmp$ du -s test*
>> 613888  test1-bare.git
>> 3653432 test2-bare.git
>> 714336  test2-manual-bare.git
>> 
>> I've not worked out why yet.
>
>Was this with a completely different tool or the same tool with
>different settings/wrappers?

Different tools.

>If it was a different tool maybe a `git gc --aggressive` will repack
>(and thus compact/delta-compress) the bigger one? (my hypothesis is
>that maybe the first run did it automatically and the second didn't)

ACK, that was my initial thought. The first tool does a "git gc" after
each revision has been converted. The second one doesn't. But I did
"git gc" and "git repack -a -d" on the second afterwards. It reduced
from ~3.8G to the ~3.5G you see here.

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
Welcome my son, welcome to the machine.

Re: Salsa

[Ian Campbell]

On Thu, 2018-05-03 at 22:10 +0100, Steve McIntyre wrote:
> The outputs from this run
> were a surprising amount bigger than my first test repo, as the
> following bare clones from each will show:
> 
> tack:/tmp$ du -s test*
> 613888  test1-bare.git
> 3653432 test2-bare.git
> 714336  test2-manual-bare.git
> 
> I've not worked out why yet.

Was this with a completely different tool or the same tool with
different settings/wrappers?

If it was a different tool maybe a `git gc --aggressive` will repack
(and thus compact/delta-compress) the bigger one? (my hypothesis is
that maybe the first run did it automatically and the second didn't)

Ian.

Re: Salsa

[Steve McIntyre]

On Fri, May 04, 2018 at 03:35:46PM +0200, Bastian Blank wrote:
>On Fri, May 04, 2018 at 02:08:40PM +0100, Steve McIntyre wrote:
>> On Fri, May 04, 2018 at 10:44:00AM +0200, Bastian Blank wrote:
>> >Does that mean you export all the old cruft from
>> >/trunk/{build,kernel,tools,utils} to this new git repo?
>> So far, yes. As I said, "For now, I've not filtered
>> any branches or anything". If people are sure that this is junk and
>> can be dropped, that's easily done.
>
>I would assume only manual, packages/po and scripts have any value to
>be preserved.  Everything else was already exported into different a
>gazillion different git repos.

ACK, fair enough. I was wondering if/how that had happened. I'll
re-run and dump that lot off into a "d-i-archive" repo to see how it
looks.

>For .mrconfig the history is pretty pointless.

Sure, but it's tiny - hardly worth bothering about. :-)

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
"I've only once written 'SQL is my bitch' in a comment. But that code 
 is in use on a military site..." -- Simon Booth

Re: Salsa

[Bastian Blank]

On Fri, May 04, 2018 at 02:08:40PM +0100, Steve McIntyre wrote:
> On Fri, May 04, 2018 at 10:44:00AM +0200, Bastian Blank wrote:
> >Does that mean you export all the old cruft from
> >/trunk/{build,kernel,tools,utils} to this new git repo?
> So far, yes. As I said, "For now, I've not filtered
> any branches or anything". If people are sure that this is junk and
> can be dropped, that's easily done.

I would assume only manual, packages/po and scripts have any value to
be preserved.  Everything else was already exported into different a
gazillion different git repos.

For .mrconfig the history is pretty pointless.

Bastian

-- 
A Vulcan can no sooner be disloyal than he can exist without breathing.
-- Kirk, "The Menagerie", stardate 3012.4

Re: Salsa

[Steve McIntyre]

On Thu, May 03, 2018 at 10:10:28PM +0100, Steve McIntyre wrote:

...

>tack:/tmp$ du -s test*
>613888  test1-bare.git
>3653432 test2-bare.git
>714336  test2-manual-bare.git
>
>I've not worked out why yet. In case people might find them useful (or
>maybe find time to have a look!), I've pushed these new test repos to
>salsa too:
>
>  https://salsa.debian.org/93sam/d-i-test2
>  https://salsa.debian.org/93sam/d-i-test2-manual
>
>Suggestions on what else we might want to separate or prune here would
>be helpful. I don't really like the idea of losing our history. We
>could maybe prune old branches, but I'm not sure it'll save much. Or
>am I worrying too much about the repo sizes already?

Just to confirm - I managed to build d-i last night using the
d-i-test2 repo as a base, just needing to tweak .mrconfig (trivial)
and scripts/git-setup (less trivial). I've not tested the output, but
it all looked sane.

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
Dance like no one's watching. Encrypt like everyone is.
 - @torproject

Re: Salsa

[Steve McIntyre]

On Fri, May 04, 2018 at 10:44:00AM +0200, Bastian Blank wrote:
>On Thu, May 03, 2018 at 10:10:28PM +0100, Steve McIntyre wrote:
>> match /trunk/
>>   repository d-i.git
>>   branch master
>> end match
>
>Does that mean you export all the old cruft from
>/trunk/{build,kernel,tools,utils} to this new git repo?

So far, yes. As I said, "For now, I've not filtered
any branches or anything". If people are sure that this is junk and
can be dropped, that's easily done.

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
"Yes, of course duct tape works in a near-vacuum. Duct tape works
 anywhere. Duct tape is magic and should be worshipped."
   -― Andy Weir, "The Martian"

Re: Salsa

[Bastian Blank]

On Thu, May 03, 2018 at 10:10:28PM +0100, Steve McIntyre wrote:
> match /trunk/
>   repository d-i.git
>   branch master
> end match

Does that mean you export all the old cruft from
/trunk/{build,kernel,tools,utils} to this new git repo?

Bastian

-- 
Each kiss is as the first.
-- Miramanee, Kirk's wife, "The Paradise Syndrome",
   stardate 4842.6

Re: Salsa

[Steve McIntyre]

YA update

On Wed, May 02, 2018 at 02:52:09PM +0100, Steve McIntyre wrote:
>Update again...
>
>On Sun, Apr 29, 2018 at 01:12:51PM +0100, Steve McIntyre wrote:
>>
>>So, an initial run of svn2git just ignoring the people directory took
>>11.5h here, and gave me a .git dir of ~680M. That's quite
>>big. I'm re-doing it now with an "authors" file in place, to get
>>something more usable.
>
>If anybody would like to play with this, I've just uploaded it to
>
>https://salsa.debian.org/93sam/d-i-test1
>
>and I'll leave it up there for now.
>
>>Discussing with KiBi on IRC last night, we're thinking that it's
>>probably worth splitting the manual off into a separate
>>project/repo. I'll try doing that too, and see what we get.
>
>To make things go much faster, I grabbed a copy of the svn repo
>directly and I've been running with that. It goes *much* more quickly
>due to the latency reduction on each revision checkout, but it
>reliably fails with:
>
>Name does not refer to a filesystem directory: Failure opening
>'/trunk/installer/build/pkg-lists/netboot/mipsel/sb1-swarm-bn.cfg':
>'/trunk/installer/build/pkg-lists/netboot/mipsel' is not a directory
>in filesystem '48c42b26-1dd6-0310-b98f-a58d8bce7237' at
>/usr/share/perl5/Git/SVN/Ra.pm line 312
>
>at r35516. Joy. I've not modified the svn data files in any way, and
>this worked from alioth...
>
>Having looked online, I find various recommendations to avoid using
>this version of svn2git (which is a simple wrapper around
>git-svn). I'm now trying the svn2git tool the KDE people used for
>migration:
>
>  https://github.com/svn-all-fast-export/svn2git.git

After some fighting with config, I've used this tool with the attached
configs - a rules to control what goes where, and a mapping file for
username -> name/email lookups.

It is *massively* faster than the first tool, something like a factor
of 15-20x. That makes it much more feasible to run this a few times
with different configs, to compare results. For now, I've not filtered
any branches or anything, but I've ignored /people and /README and
moved the manual out into a separate repo. The outputs from this run
were a surprising amount bigger than my first test repo, as the
following bare clones from each will show:

tack:/tmp$ du -s test*
613888  test1-bare.git
3653432 test2-bare.git
714336  test2-manual-bare.git

I've not worked out why yet. In case people might find them useful (or
maybe find time to have a look!), I've pushed these new test repos to
salsa too:

  https://salsa.debian.org/93sam/d-i-test2
  https://salsa.debian.org/93sam/d-i-test2-manual

Suggestions on what else we might want to separate or prune here would
be helpful. I don't really like the idea of losing our history. We
could maybe prune old branches, but I'm not sure it'll save much. Or
am I worrying too much about the repo sizes already?

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
You lock the door
And throw away the key
There's someone in my head but it's not me 
93sam = Steve McIntyre <93...@debian.org>
adioe3-guest = Armin Beširović <ar...@linux.org.ba>
adn = Mohammed Adnène Trojette <a...@debian.org>
adn-guest = Mohammed Adnène Trojette <a...@debian.org>
adorosh-guest = Andrei Darashenka <adoro...@it.org.by>
adrianorg = Adriano Rafael Gomes <adrian...@debian.org>
adrianorg-guest = Adriano Rafael Gomes <adrian...@arg.eti.br>
agx = Guido Guenther <a...@sigxcpu.org>
aiet-guest = Aiet Kolkhi  <aietkol...@gmail.com>
aigarius = Aigars Mahinovs <aigar...@debian.org>
ajenbo-guest = Anders Jenbo <and...@jenbo.dk>
ajt = Anthony Towns <a...@debian.org>
akumar = Kumar Appaiah <aku...@debian.org>
albbas-guest = Børre Gaup <boe...@skolelinux.no>
alphix-guest = David Härdeman <da...@hardeman.nu>
amanpreet-guest = A S Alam <amanpreet.a...@gmail.com>
amp-guest = Andrei Popescu <andreimpope...@gmail.com>
andersee = Erik B. Andersen <ander...@debian.org>
andread-guest = Andreas Dahl <andr...@linpro.no>
andreas = Andreas Schuldei <andr...@debian.org>
andred-guest = André Dahlqvist <aneda...@student.luth.se>
andrelop = Andre Luis Lopes <andre...@debian.org>
anmar-guest = Anmar Oueja <an...@canada.com>
aph = Adam Di Carlo <a...@debian.org>
appaji = Giridhar Appaji Nag Yasa <app...@debian.org>
appaji-guest = Y Giridhar Appaji Nag  <girid...@appaji.net>
arangel-guest = Arangel Angov <u...@linux.net.mk>
arashb-guest = Arash Bijanzadeh <abijanza...@yahoo.com>
arief-guest = Arief S Fitrianto <ar...@gurame.fisika.ui.ac.id>
arjunaraoc-guest = Arjuna Rao Chavala <arjunar...@gmail.com>
athornton-guest = Adam Thornton <athorn...@sinenomine.net>
aurel32 = Aurelien Jarno <aure...@debian.org&

Re: Salsa

[Ben Hutchings]

On Wed, 2018-05-02 at 14:52 +0100, Steve McIntyre wrote:
[...]
> Having looked online, I find various recommendations to avoid using
> this version of svn2git (which is a simple wrapper around
> git-svn). I'm now trying the svn2git tool the KDE people used for
> migration:
> 
>   https://github.com/svn-all-fast-export/svn2git.git

This seems to be the right tool for weird Subversion repos - and
Subversion makes it easy to do weird things by accident!  I used it for
converting the kernel repo.  I had to do a small amount of post-
processing with git filter-branch.

If you need examples of dealing with weird stuff, see
https://salsa.debian.org/kernel-team/d-k-conversion

Ben.

-- 
Ben Hutchings
One of the nice things about standards is that
there are so many of them.


signature.asc
Description: This is a digitally signed message part

Re: Salsa

[Steve McIntyre]

Update again...

On Sun, Apr 29, 2018 at 01:12:51PM +0100, Steve McIntyre wrote:
>
>So, an initial run of svn2git just ignoring the people directory took
>11.5h here, and gave me a .git dir of ~680M. That's quite
>big. I'm re-doing it now with an "authors" file in place, to get
>something more usable.

If anybody would like to play with this, I've just uploaded it to

https://salsa.debian.org/93sam/d-i-test1

and I'll leave it up there for now.

>Discussing with KiBi on IRC last night, we're thinking that it's
>probably worth splitting the manual off into a separate
>project/repo. I'll try doing that too, and see what we get.

To make things go much faster, I grabbed a copy of the svn repo
directly and I've been running with that. It goes *much* more quickly
due to the latency reduction on each revision checkout, but it
reliably fails with:

Name does not refer to a filesystem directory: Failure opening
'/trunk/installer/build/pkg-lists/netboot/mipsel/sb1-swarm-bn.cfg':
'/trunk/installer/build/pkg-lists/netboot/mipsel' is not a directory
in filesystem '48c42b26-1dd6-0310-b98f-a58d8bce7237' at
/usr/share/perl5/Git/SVN/Ra.pm line 312

at r35516. Joy. I've not modified the svn data files in any way, and
this worked from alioth...

Having looked online, I find various recommendations to avoid using
this version of svn2git (which is a simple wrapper around
git-svn). I'm now trying the svn2git tool the KDE people used for
migration:

  https://github.com/svn-all-fast-export/svn2git.git

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
"...In the UNIX world, people tend to interpret `non-technical user'
 as meaning someone who's only ever written one device driver." -- Daniel Pead

Re: Salsa

[Steve McIntyre]

Update...

On Sat, Apr 28, 2018 at 11:52:42PM +0100, Steve McIntyre wrote:
>
>Yup. I'm now working on the svn2git conversion for the top-level d-i
>svn repo. It's taking a while with ~70k commits to resolve! I'm
>explicitly ignoring the "people" dir for now, as most of those
>personal brances are ancient:
>
>$ svn ls -v svn://svn.debian.org/svn/d-i/people/ 
>  69848 adrianor  Apr 22  2015 ./
>  40600 xam   Sep 12  2006 alphix-guest/
>  43936 fjp   Jan 06  2007 barbier/
>  57427 bubulle   Jan 23  2009 bubulle/
>  50510 cjwatson  Dec 18  2007 cjwatson/
>  41238 eddyp-gu  Oct 04  2006 eddyp/
>  62833 fjp   Apr 01  2010 fjp/
>  40623 huggieSep 13  2006 huggie/
>  21996 jbailey   Sep 24  2004 jbailey/
>  60699 joeyh Sep 09  2009 joeyh/
>  48862 lunar Aug 03  2007 lunar/
>  41604 sferriol  Oct 12  2006 ninou/
>  40190 joeyh Aug 24  2006 otavio/
>  42674 pgeyleg-  Nov 17  2006 pema/
>  51136 philh Feb 01  2008 philh/
>  49104 rmh   Sep 01  2007 rmh/
>  69848 adrianor  Apr 22  2015 sandbox/
>  17800 sjogren   Jul 16  2004 sjogren/
>  63663 aurel32   Jul 06  2010 slackydeb/
>  41094 stappers  Sep 29  2006 stappers/
>  35463 tbm   Mar 16  2006 tbm/
>  65626 cjwatson  Nov 15  2010 waldi/
>  66442 wouterMar 13  2011 wouter/
>  41260 fjp   Oct 05  2006 xam/
>  49051 zinoviev  Aug 27  2007 zinoviev/
>
>If people want their old personal svn branches, shout now or they can
>grab them from the archive...

So, an initial run of svn2git just ignoring the people directory took
11.5h here, and gave me a .git dir of ~680M. That's quite
big. I'm re-doing it now with an "authors" file in place, to get
something more usable.

Discussing with KiBi on IRC last night, we're thinking that it's
probably worth splitting the manual off into a separate
project/repo. I'll try doing that too, and see what we get.

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
"...In the UNIX world, people tend to interpret `non-technical user'
 as meaning someone who's only ever written one device driver." -- Daniel Pead

Re: Salsa

[Steve McIntyre]

On Fri, Apr 27, 2018 at 04:20:26AM +0200, Cyril Brulebois wrote:
>Hi,
>
>I've just checked the list you provided below with what's in my local
>copy, deployed with .mrconfig:
>
>Steve McIntyre <st...@einval.com> (2018-04-26):
>> bak.debootstrap
>
>=> deleted as mentioned earlier.
>
>> d-i
>
>=> can go away (alioth generated for all git-based projects)?

Yup. It's empty, so I've killed it. We'll want it anyway for the
top-level d-i git repo, see below!

>> daily-build-logs
>
>=> repository is likely corrupted, not sure it's recoverable; it might
>   make sense to scratch it since its main purpose is to make it easy
>   to find what broke when daily builds regress. Most useful short term
>   anyway, IMHO.

Nod. Looks totally broken, so the import to salsa didn't work. Deleted
the salsa project.

>> kadit-playbooks
>> kadit
>
>=> both not mentioned on purpose

Nod.

>So I think we're (almost) good here.

Yup. I'm now working on the svn2git conversion for the top-level d-i
svn repo. It's taking a while with ~70k commits to resolve! I'm
explicitly ignoring the "people" dir for now, as most of those
personal brances are ancient:

$ svn ls -v svn://svn.debian.org/svn/d-i/people/ 
  69848 adrianor  Apr 22  2015 ./
  40600 xam   Sep 12  2006 alphix-guest/
  43936 fjp   Jan 06  2007 barbier/
  57427 bubulle   Jan 23  2009 bubulle/
  50510 cjwatson  Dec 18  2007 cjwatson/
  41238 eddyp-gu  Oct 04  2006 eddyp/
  62833 fjp   Apr 01  2010 fjp/
  40623 huggieSep 13  2006 huggie/
  21996 jbailey   Sep 24  2004 jbailey/
  60699 joeyh Sep 09  2009 joeyh/
  48862 lunar Aug 03  2007 lunar/
  41604 sferriol  Oct 12  2006 ninou/
  40190 joeyh Aug 24  2006 otavio/
  42674 pgeyleg-  Nov 17  2006 pema/
  51136 philh Feb 01  2008 philh/
  49104 rmh   Sep 01  2007 rmh/
  69848 adrianor  Apr 22  2015 sandbox/
  17800 sjogren   Jul 16  2004 sjogren/
  63663 aurel32   Jul 06  2010 slackydeb/
  41094 stappers  Sep 29  2006 stappers/
  35463 tbm   Mar 16  2006 tbm/
  65626 cjwatson  Nov 15  2010 waldi/
  66442 wouterMar 13  2011 wouter/
  41260 fjp   Oct 05  2006 xam/
  49051 zinoviev  Aug 27  2007 zinoviev/

If people want their old personal svn branches, shout now or they can
grab them from the archive...

-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
"I've only once written 'SQL is my bitch' in a comment. But that code 
 is in use on a military site..." -- Simon Booth