git-ubuntu

Merge ~racb/git-ubuntu:parameterised-keyrings into git-ubuntu:master

  1. Git
  2. lp:~racb/git-ubuntu
  3. parameterised-keyrings
  4. Merge into master
Proposed by Robie Basak
Status: Merged
Merged at revision: c9eb97ea447d4bf5f2ebcb3f1b2650421bc8293a
Proposed branch: ~racb/git-ubuntu:parameterised-keyrings
Merge into: git-ubuntu:master
Diff against target: 159 lines (+49/-19)
2 files modified
gitubuntu/importer_service_poller.py (+22/-0)
gitubuntu/scriptutils.py (+27/-19)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+407192@code.staging.launchpad.net

Commit message

Make Jenkins happy

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:c9eb97ea447d4bf5f2ebcb3f1b2650421bc8293a
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/53/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/53//rebuild

review: Approve (continuous-integration)
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

commit 39a311b10c5eaf9a4489e0bf64590e84c3c81ec4
Author: Robie Basak <email address hidden>
Date: Mon Aug 16 14:40:56 2021 +0100

    Update scriptutils docstrings

=> ok

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

commit e5e1bf6839007024a11db02f57e978bca93f0945
Author: Robie Basak <email address hidden>
Date: Mon Aug 16 14:44:20 2021 +0100

    scriptutils/poller: explicitly specify gpg paths

It defaulted to DEFAULT_TRUSTED_KEYRING_PATHS in _verify
And now things are "passed through the strack" but the default still is the same default from main to scriptutils.srcpkgs_to_import_list.

extra_trusted_keyrings (later) extends a list, that should still work.

It was a list of paths, it still is a list - fine

=> ok

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

commit c9eb97ea447d4bf5f2ebcb3f1b2650421bc8293a (HEAD -> parameterised-keyrings, rbasak/parameterised-keyrings)
Author: Robie Basak <email address hidden>
Date: Mon Aug 16 14:59:06 2021 +0100

    poller: add --extra-trusted-keyring option

Allows to extend the keyrings from main via a new argument.

=> ok

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Neither the manual review nor the checker tools complained about it.
I guess this is fine to be merged, you said you tested it manually since the auto-test coverage isn't too good.
That should be enough for now +1

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches