Re: Transitioning the sync-blacklist vcs to git
On Wed, Jul 05, 2023 at 11:43:32AM +0200, Sebastien Bacher wrote: > Hey there, > > I've imported the sync-blacklist bzr repository [1] to git [2] and submitted > a merge request [3] to update the update-sync-blacklist job to use the git > location Can we rename it to sync-blocklist while we're at it? -- debian developer - deb.li/jak | jak-linux.org - free software dev ubuntu core developer i speak de, en -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
Did you read the email to the end? That question is what I was asking in 3. Le 05/07/2023 à 12:13, Julian Andres Klode a écrit : On Wed, Jul 05, 2023 at 11:43:32AM +0200, Sebastien Bacher wrote: Hey there, I've imported the sync-blacklist bzr repository [1] to git [2] and submitted a merge request [3] to update the update-sync-blacklist job to use the git location Can we rename it to sync-blocklist while we're at it? -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
I'm going to assume that we want to take the opportunity to do the inclusive naming change and pushed a new vcs there https://code.launchpad.net/~ubuntu-archive/+git/sync-blocklist Cheers, Sébastien Bacher Le 05/07/2023 à 11:43, Sebastien Bacher a écrit : Hey there, I've imported the sync-blacklist bzr repository [1] to git [2] and submitted a merge request [3] to update the update-sync-blacklist job to use the git location Now I've some questions for archive/release team members 1. do you know of any other script/job that needs to be updated for the Vcs move? 2. do we need to manually update the ubuntu-archive-scripts checkout on the archive server or is that automated? 3. Should we try to fix https://bugs.launchpad.net/ubuntu-archive-scripts/+bug/1915708 at the same time and rename blacklist to blocklist (inclusive naming)? And if so do we think we need some sort of compat symlink at least for the file exported on https://people.canonical.com/~ubuntu-archive/sync-blacklist.txt? Cheers, Sébastien [1] https://code.launchpad.net/~ubuntu-archive/+junk/sync-blacklist [2] https://code.launchpad.net/~ubuntu-archive/+git/sync-blacklist [3] https://code.launchpad.net/~seb128/ubuntu-archive-scripts/ubuntu-archive-scripts/+merge/445524 -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
And corresponding changes to the archive utilities https://code.launchpad.net/~seb128/ubuntu-archive-tools/+git/ubuntu-archive-tools/+merge/446082 https://code.launchpad.net/~seb128/ubuntu-archive-scripts/blocklist/+merge/446079 Cheers, Sébastien Le 05/07/2023 à 15:39, Sebastien Bacher a écrit : I'm going to assume that we want to take the opportunity to do the inclusive naming change and pushed a new vcs there https://code.launchpad.net/~ubuntu-archive/+git/sync-blocklist Cheers, Sébastien Bacher Le 05/07/2023 à 11:43, Sebastien Bacher a écrit : Hey there, I've imported the sync-blacklist bzr repository [1] to git [2] and submitted a merge request [3] to update the update-sync-blacklist job to use the git location Now I've some questions for archive/release team members 1. do you know of any other script/job that needs to be updated for the Vcs move? 2. do we need to manually update the ubuntu-archive-scripts checkout on the archive server or is that automated? 3. Should we try to fix https://bugs.launchpad.net/ubuntu-archive-scripts/+bug/1915708 at the same time and rename blacklist to blocklist (inclusive naming)? And if so do we think we need some sort of compat symlink at least for the file exported on https://people.canonical.com/~ubuntu-archive/sync-blacklist.txt? Cheers, Sébastien [1] https://code.launchpad.net/~ubuntu-archive/+junk/sync-blacklist [2] https://code.launchpad.net/~ubuntu-archive/+git/sync-blacklist [3] https://code.launchpad.net/~seb128/ubuntu-archive-scripts/ubuntu-archive-scripts/+merge/445524 -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
Thanks for taking the initiative on this, it's been on my todo for quite a while but I haven't been where I wanted to deal with the coordination of migrating it. I've staged a change that I can push to the bzr branch once all the automation is moved over, to delete the contents and leave a breadcrumb to the new branch. On Wed, Jul 05, 2023 at 11:43:32AM +0200, Sebastien Bacher wrote: > Hey there, > I've imported the sync-blacklist bzr repository [1] to git [2] and submitted > a merge request [3] to update the update-sync-blacklist job to use the git > location > Now I've some questions for archive/release team members > 1. do you know of any other script/job that needs to be updated for the Vcs > move? > 2. do we need to manually update the ubuntu-archive-scripts checkout on the > archive server or is that automated? Must be manually updated. > 3. Should we try to fix > https://bugs.launchpad.net/ubuntu-archive-scripts/+bug/1915708 at the same > time and rename blacklist to blocklist (inclusive naming)? And if so do we > think we need some sort of compat symlink at least for the file exported on > https://people.canonical.com/~ubuntu-archive/sync-blacklist.txt? Yes, please include a compat symlink. This can be created directly in the public_html directory. > Cheers, > Sébastien > > [1] https://code.launchpad.net/~ubuntu-archive/+junk/sync-blacklist > [2] https://code.launchpad.net/~ubuntu-archive/+git/sync-blacklist > [3] > https://code.launchpad.net/~seb128/ubuntu-archive-scripts/ubuntu-archive-scripts/+merge/445524 -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org signature.asc Description: PGP signature -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
- Approved and merged the bzr branch for update-sync-blocklist - Checked out the 'blocklist' git branch to the required location on ubuntu-archive-toolbox - Updated ubuntu-archive-scripts checkout on ubuntu-archive-toolbox - Updated the crontab for the new script name - Renamed ~/public_html/sync-blacklist.txt to ~/public_html/sync-blocklist.txt and added compat symlink - Waiting until the frontend updates and https://ubuntu-archive-team.ubuntu.com/sync-blocklist.txt is visible before updating ubuntu-archive-tools On Wed, Jul 05, 2023 at 08:18:38AM -0700, Steve Langasek wrote: > Thanks for taking the initiative on this, it's been on my todo for quite a > while but I haven't been where I wanted to deal with the coordination of > migrating it. > > I've staged a change that I can push to the bzr branch once all the > automation is moved over, to delete the contents and leave a breadcrumb to > the new branch. > > On Wed, Jul 05, 2023 at 11:43:32AM +0200, Sebastien Bacher wrote: > > Hey there, > > > I've imported the sync-blacklist bzr repository [1] to git [2] and submitted > > a merge request [3] to update the update-sync-blacklist job to use the git > > location > > > Now I've some questions for archive/release team members > > > 1. do you know of any other script/job that needs to be updated for the Vcs > > move? > > > 2. do we need to manually update the ubuntu-archive-scripts checkout on the > > archive server or is that automated? > > Must be manually updated. > > > 3. Should we try to fix > > https://bugs.launchpad.net/ubuntu-archive-scripts/+bug/1915708 at the same > > time and rename blacklist to blocklist (inclusive naming)? And if so do we > > think we need some sort of compat symlink at least for the file exported on > > https://people.canonical.com/~ubuntu-archive/sync-blacklist.txt? > > Yes, please include a compat symlink. This can be created directly in the > public_html directory. > > > Cheers, > > Sébastien > > > > [1] https://code.launchpad.net/~ubuntu-archive/+junk/sync-blacklist > > [2] https://code.launchpad.net/~ubuntu-archive/+git/sync-blacklist > > [3] > > https://code.launchpad.net/~seb128/ubuntu-archive-scripts/ubuntu-archive-scripts/+merge/445524 > > > -- > Steve Langasek Give me a lever long enough and a Free OS > Debian Developer to set it on, and I can move the world. > Ubuntu Developer https://www.debian.org/ > slanga...@ubuntu.com vor...@debian.org > -- > Ubuntu-release mailing list > Ubuntu-release@lists.ubuntu.com > Modify settings or unsubscribe at: > https://lists.ubuntu.com/mailman/listinfo/ubuntu-release -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org signature.asc Description: PGP signature -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
- https://ubuntu-archive-team.ubuntu.com/sync-blocklist.txt exists, so landing the ubuntu-archive-tools changes (including the checkout on ubuntu-archive-toolbox) - pushed the breadcrumb to the old bzr branch Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org On Wed, Jul 05, 2023 at 08:37:04AM -0700, Steve Langasek wrote: > - Approved and merged the bzr branch for update-sync-blocklist > - Checked out the 'blocklist' git branch to the required location on > ubuntu-archive-toolbox > - Updated ubuntu-archive-scripts checkout on ubuntu-archive-toolbox > - Updated the crontab for the new script name > - Renamed ~/public_html/sync-blacklist.txt to > ~/public_html/sync-blocklist.txt and added compat symlink > - Waiting until the frontend updates and > https://ubuntu-archive-team.ubuntu.com/sync-blocklist.txt is visible > before updating ubuntu-archive-tools > > On Wed, Jul 05, 2023 at 08:18:38AM -0700, Steve Langasek wrote: > > Thanks for taking the initiative on this, it's been on my todo for quite a > > while but I haven't been where I wanted to deal with the coordination of > > migrating it. > > > > I've staged a change that I can push to the bzr branch once all the > > automation is moved over, to delete the contents and leave a breadcrumb to > > the new branch. > > > > On Wed, Jul 05, 2023 at 11:43:32AM +0200, Sebastien Bacher wrote: > > > Hey there, > > > > > I've imported the sync-blacklist bzr repository [1] to git [2] and > > > submitted > > > a merge request [3] to update the update-sync-blacklist job to use the git > > > location > > > > > Now I've some questions for archive/release team members > > > > > 1. do you know of any other script/job that needs to be updated for the > > > Vcs > > > move? > > > > > 2. do we need to manually update the ubuntu-archive-scripts checkout on > > > the > > > archive server or is that automated? > > > > Must be manually updated. > > > > > 3. Should we try to fix > > > https://bugs.launchpad.net/ubuntu-archive-scripts/+bug/1915708 at the same > > > time and rename blacklist to blocklist (inclusive naming)? And if so do we > > > think we need some sort of compat symlink at least for the file exported > > > on > > > https://people.canonical.com/~ubuntu-archive/sync-blacklist.txt? > > > > Yes, please include a compat symlink. This can be created directly in the > > public_html directory. > > > > > Cheers, > > > Sébastien > > > > > > [1] https://code.launchpad.net/~ubuntu-archive/+junk/sync-blacklist > > > [2] https://code.launchpad.net/~ubuntu-archive/+git/sync-blacklist > > > [3] > > > https://code.launchpad.net/~seb128/ubuntu-archive-scripts/ubuntu-archive-scripts/+merge/445524 > > > > > > -- > > Steve Langasek Give me a lever long enough and a Free OS > > Debian Developer to set it on, and I can move the world. > > Ubuntu Developer https://www.debian.org/ > > slanga...@ubuntu.com vor...@debian.org > > > > > -- > > Ubuntu-release mailing list > > Ubuntu-release@lists.ubuntu.com > > Modify settings or unsubscribe at: > > https://lists.ubuntu.com/mailman/listinfo/ubuntu-release > > > -- > Steve Langasek Give me a lever long enough and a Free OS > Debian Developer to set it on, and I can move the world. > Ubuntu Developer https://www.debian.org/ > slanga...@ubuntu.com vor...@debian.org signature.asc Description: PGP signature -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
Thanks Steve for reviewing and merging the changes! Since that landed I also went ahead and converted that one https://code.launchpad.net/ubuntu-archive-scripts/+git If that's ok with others should we also deprecate the corresponding bzr repository? There is a checkout on ubuntu-archive-toolbox with some local delta (are those changes still needed? could they be pushed to the vcs?) which I can switch (reapplying the local changes for now) Cheers, Sébastien Le 05/07/2023 à 18:31, Steve Langasek a écrit : - https://ubuntu-archive-team.ubuntu.com/sync-blocklist.txt exists, so landing the ubuntu-archive-tools changes (including the checkout on ubuntu-archive-toolbox) - pushed the breadcrumb to the old bzr branch Thanks, -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
On Wed, Jul 05, 2023 at 08:30:31PM +0200, Sebastien Bacher wrote: > Thanks Steve for reviewing and merging the changes! > Since that landed I also went ahead and converted that one > https://code.launchpad.net/ubuntu-archive-scripts/+git > If that's ok with others should we also deprecate the corresponding bzr > repository? Outstanding MPs for +junk branches are obviously not an issue, but for u-a-scripts there's: https://code.launchpad.net/~ubuntu-archive/ubuntu-archive-scripts/trunk/+activereviews still awaiting feedback from another AA. > There is a checkout on ubuntu-archive-toolbox with some local delta (are > those changes still needed? could they be pushed to the vcs?) which I can > switch (reapplying the local changes for now) I think all of those changes are mine. Some of them are from the server migration and should definitely be landed. I do not remember why I made the change to background_wait behavior and I should probably try to remember rather than just dropping the change (considering how long it's been cowboyed in production). Let's settle some of these changes out on the existing bzr branch before switching it to git, please. > Le 05/07/2023 à 18:31, Steve Langasek a écrit : > > - https://ubuntu-archive-team.ubuntu.com/sync-blocklist.txt exists, so > >landing the ubuntu-archive-tools changes (including the checkout on > >ubuntu-archive-toolbox) > > - pushed the breadcrumb to the old bzr branch > > > > Thanks, > -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org signature.asc Description: PGP signature -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
Le 05/07/2023 à 22:51, Steve Langasek a écrit : Outstanding MPs for +junk branches are obviously not an issue, but for u-a-scripts there's: https://code.launchpad.net/~ubuntu-archive/ubuntu-archive-scripts/trunk/+activereviews still awaiting feedback from another AA. That has been merged now and I've updated the git import Let's settle some of these changes out on the existing bzr branch before switching it to git, please. Alright Cheers, Sébastien -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
https://code.launchpad.net/~ubuntu-archive/+git shows that there is both a sync-blacklist repo and a sync-blocklist repo. Can the git blacklist repo be deleted now to avoid confusion? Thank you, Jeremy Bícha -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
Re: Transitioning the sync-blacklist vcs to git
On Sat, Sep 09, 2023 at 11:07:15AM -0400, Jeremy Bícha wrote: > https://code.launchpad.net/~ubuntu-archive/+git shows that there is > both a sync-blacklist repo and a sync-blocklist repo. > Can the git blacklist repo be deleted now to avoid confusion? Done, thanks (was reminded via https://bugs.launchpad.net/ubuntu/+source/libnginx-mod-http-lua/+bug/2035387). -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org signature.asc Description: PGP signature -- Ubuntu-release mailing list Ubuntu-release@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-release
