1
diff --git a/olsjenkaas/commands.py b/olsjenkaas/commands.py
2
index 971843a..b07563f 100644
3
--- a/olsjenkaas/commands.py
4
+++ b/olsjenkaas/commands.py
5
@@ -531,8 +531,13 @@ class LandApprovedProposal(CommandWithContainer):
6
531
531
7
532
    def land_proposal(self, proposal, target_url):
532
    def land_proposal(self, proposal, target_url):
8
533
        """
533
        """
11
534
        Land a proposal (validate, merge, run landing tests, push upstream).
534
        Lands a proposal by performing the necessary steps including validation,
12
535
        Returns 0 if successful, otherwise 1.
535
        merging, running tests, pushing merged branch, and updating the proposal status.
13
536
14
537
        :param proposal: The proposal to land. See https://api.launchpad.net/devel.html#branch_merge_proposal
15
538
            for data structure.
16
539
        :param target_url: The URL of the merge target.
17
540
        :return: 0 if the proposal was successfully landed, 1 if it failed or was rejected.
18
536
        """
541
        """
19
537
542
20
538
        logger.info("Trying to land {}".format(proposal.web_link))
543
        logger.info("Trying to land {}".format(proposal.web_link))
21
@@ -542,6 +547,8 @@ class LandApprovedProposal(CommandWithContainer):
22
542
                raise Rejected("A commit message must be set.")
547
                raise Rejected("A commit message must be set.")
23
543
            if not launchpad.is_approved(proposal, self.target):
548
            if not launchpad.is_approved(proposal, self.target):
24
544
                raise Rejected("Voting criteria not met.")
549
                raise Rejected("Voting criteria not met.")
25
550
            if not launchpad.all_dependencies_merged(proposal):
26
551
                raise Rejected("A dependent proposal is still not merged.")
27
545
552
28
546
            # prepare merge target
553
            # prepare merge target
29
547
            local_work_dir = os.path.realpath(self.options.work_dir)
554
            local_work_dir = os.path.realpath(self.options.work_dir)
30
diff --git a/olsjenkaas/launchpad.py b/olsjenkaas/launchpad.py
31
index 0f3d653..68f941e 100644
32
--- a/olsjenkaas/launchpad.py
33
+++ b/olsjenkaas/launchpad.py
34
@@ -104,3 +104,44 @@ def is_approved(proposal, target):
35
104
         votes['Needs Information'] == 0)):
104
         votes['Needs Information'] == 0)):
36
105
        approved = True
105
        approved = True
37
106
    return approved
106
    return approved
38
107
39
108
40
109
def get_dependencies(proposal):
41
110
    """
42
111
    Get all dependencies of the proposal.
43
112
44
113
    :param proposal: The proposal with dependencies to fetch. See https://api.launchpad.net/devel.html#branch_merge_proposal
45
114
        for data structure.
46
115
    :return: A list of all dependencies
47
116
    """
48
117
49
118
    if not proposal.prerequisite_git_repository:
50
119
        return []
51
120
52
121
    # search all merge proposals of the parent git repository
53
122
    # find candidates where MP source (identity) matches the
54
123
    # original proposal's prerequisite
55
124
    prerequisites = (
56
125
        mp
57
126
        for mp in proposal.target_git_repository.getMergeProposals()
58
127
        if mp.source_git_path
59
128
        and mp.source_git_path == proposal.prerequisite_git_path
60
129
    )
61
130
62
131
    return prerequisites
63
132
64
133
65
134
def all_dependencies_merged(proposal):
66
135
    """
67
136
    Checks if all dependencies of a proposal have been merged.
68
137
69
138
    :param proposal: The proposal with dependencies to check. See https://api.launchpad.net/devel.html#branch_merge_proposal
70
139
        for data structure.
71
140
    :return: True if all dependencies are merged, False otherwise.
72
141
    """
73
142
74
143
    for dependency in get_dependencies(proposal):
75
144
        if dependency.queue_status != 'Merged':
76
145
            return False
77
146
78
147
    return True
Status:	Work in progress
Proposed branch:	~lofidevops/ols-jenkaas:sn1780-mergebot-dependent-branches
Merge into:	ols-jenkaas:main
Diff against target:	78 lines (+50/-2) 2 files modified olsjenkaas/commands.py (+9/-2) olsjenkaas/launchpad.py (+41/-0)
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Maximiliano Bertacchini	2024-03-27	Approve on 2024-05-17
Emma Brostrom (community)		Needs Information on 2024-05-14
Review via email: mp+463204@code.launchpad.net