Set the workflow of A to -1, set B to depend on A. Once B is fully approved and W+1, then A can be W+1, and (hopefully) they get merged in the same window. -----Original Message----- From: McKenna, Jason [mailto:Jason.McKenna@windriver.com] Sent: Thursday, November 08, 2018 12:15 PM To: Dean Troyer; Lin, Shuicheng Cc: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] Build failure on lastest build Sterling 31/10/2018 Hi StarlingX, One possible workaround particular for the case of modifying the lst files are to use 3 commits: A - Adds the new source rpm to the .lst file in stx-tools B - Changes the code in [your git] to use the new source RPM C - Removes the old source rpm from the .lst file in stx-tools C Depends-On B B Depends-On A The only downside is that for some window, you might have two versions of the source rpm in your workspace, eating an extra few MB of disk space. -Jason
-----Original Message----- From: Dean Troyer <dtroyer@gmail.com> Sent: November 8, 2018 10:56 AM To: Lin, Shuicheng <shuicheng.lin@intel.com> Cc: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] Build failure on lastest build Sterling 31/10/2018
On Wed, Nov 7, 2018 at 11:12 PM Lin, Shuicheng <shuicheng.lin@intel.com> wrote:
The two patches need be merged together, so it is like A and B depends on each other. But currently in gerrit/zuul, we cannot make patch depends on each other. It is a limitation I think. So I just set A depends on B.
In this situation the best approach is to get A approved first. It will go through the gate pipeline but will not merge until B is approved. When B gets through the gate pipeline they will both merge close together. It is still not at exactly the same time but is gets close.
You do not have to wait until A is done before approving B, you just want it to get started enough earlier so B does not finish ahead of it. This minimizes the gap between the merges.
dt
--
Dean Troyer dtroyer@gmail.com
_______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss