git-ubuntu

Merge ~nacc/git-ubuntu:lp1711174-lint-check-changelog-dist into git-ubuntu:master

  1. Git
  2. lp:~nacc/git-ubuntu
  3. lp1711174-lint-check-changelog-dist
  4. Merge into master
Proposed by Nish Aravamudan
Status: Merged
Approved by: Nish Aravamudan
Approved revision: 6d8000fd2b12bfdcf2fd9af5f93404cd21fd65b5
Merge reported by: Nish Aravamudan
Merged at revision: 6d8000fd2b12bfdcf2fd9af5f93404cd21fd65b5
Proposed branch: ~nacc/git-ubuntu:lp1711174-lint-check-changelog-dist
Merge into: git-ubuntu:master
Diff against target: 21 lines (+10/-0)
1 file modified
gitubuntu/lint.py (+10/-0)
Reviewer Review Type Date Requested Status
Nish Aravamudan Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+330879@code.launchpad.net

Description of the change

Make jenkins happy.

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

FAILED: Continuous integration, rev:b6c43c70d17b0c8f45e11bae0c620efb818e2a0e
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/93/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Style Check

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:094a4aea9ef3c5f3507a164ea367c309984204bb
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/100/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:6d8000fd2b12bfdcf2fd9af5f93404cd21fd65b5
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/131/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)
Revision history for this message
Nish Aravamudan (nacc) :
review: Approve
Revision history for this message
Nish Aravamudan (nacc) wrote :

self-approving.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/gitubuntu/lint.py b/gitubuntu/lint.py
2index baa1492..0897eef 100644
3--- a/gitubuntu/lint.py
4+++ b/gitubuntu/lint.py
5@@ -657,6 +657,16 @@ def do_change_lint(repo, commitish_string, pkg_remote_branch_string):
6 ret = False
7 # 3) has update-maintainer been run?
8 ret = _check_update_maintainer(repo, commitish_string) and ret
9+ # 4) does target branch match changelog?
10+ pkg_branch_series = pkg_remote_branch_string[len('pkg/'):].split('/')[1].split('-')[0]
11+ if dist != pkg_branch_series:
12+ error(
13+ "Targetted branch distribution (%s) and changelog "
14+ "distribution (%s) do not agree",
15+ pkg_branch_series,
16+ dist,
17+ )
18+ ret = False
19 return ret
20
21 def derive_lint_namespace(repo, commitish_string):

Subscribers

People subscribed via source and target branches