Re: [edk2-devel] [Patch v3 00/22] Enable Phase 1 of EDK II CI

["Laszlo Ersek" <lersek@redhat.com>]

Hi Mike,

On 11/01/19 06:03, Kinney, Michael D wrote:
> Hi Laszlo,
> 
> ===================================================
> Note for all reviewers:
> ---------------------------------------------------
> Pull requests against edk2-staging/edk2-ci are not
> being processed right now.  We are working on some
> configuration changes after noticing that all the
> checks were not being shown on the Web UI.  We will
> let you know when it is back up.
> ===================================================
> 
> Yes.  You need to create a fork of the tianocore/edk2-staging repo.
> 
> You can do this with the WebUI or the hub command line utility.
> 
> * https://github.com/github/hub
> * https://github.com/github/hub/releases
> * https://hub.github.com/hub.1.html
> 
> The hub command also supports creating a pull request.
> I have used it extensively to write some unit tests
> for edk2-ci this week.
> 
> Once you create a branch with changes to submit in your
> own fork of tianocore/edk2-staging the WebUI will show
> that this pull request is possible and guide you through
> it.
> 
> The use of edk2-staging/edk2-ci is only for the review
> and unit testing.  Once the review is approved, it will
> be enabled on edk2/master and you will be able to use
> your own fork of edk2 to make branches and submit pull
> requests.

* For now, I submitted a pull request using the WebUi.

https://github.com/tianocore/edk2-staging/pull/87

I can see the processing is paused at the moment, as you state above.


* When I submitted PR#87, there had been no conflicts; the PR was simply
blocked on the CI tasks. Now, there are conflicts (I assume due to
intervening pushes, while my PR#87 was blocked). It's useful that the
WebUI points out this change in the status of the PR (i.e., "now
conflicting" vs. "no conflicts just waiting for CI"). However, this
status change has not been emailed to me.

When this occurs to a PR (for example due to an intervening PR that is
merged), what happens to the pre-empted PR? Does it remain suspended
forever? How does the submitter learn about it?


* Regarding my question (b) below, the answer is "I can't". I cannot
submit a PR against tianocore/edk2-staging.git with reference to
lersek/edk2.git, given that the latter is a not a "github-level fork" of
the former.

This is quite regrettable, but once the CI system is in production, it
will be OK in practice (I will only submit PRs against tianocore/edk2.git).


* I've explored the "hub" command a bit. (This relates to my question
(a); thanks for your suggestion.)

On the positive side, it is packaged in EPEL7, therefore I could readily
install it on my RHEL7 laptop, from a distribution-level package.

On the negative side, I quickly noticed two issues with "hub". I went
looking in the "hub" issue tracker, and to my relief, others had
reported the same problems before me (so I only commented on, and
subscribed to, the reports):

https://github.com/github/hub/issues/2338#issuecomment-548952413
https://github.com/github/hub/issues/2222#issuecomment-548967446

Issue#2338 is more technically challenging, but in practice (once CI is
enabled for edk2 itself), it's not really going to affect me.

Issue#2222 should be easy to solve, technically speaking, but until it's
solved, I find it quite disappointing.

Thanks!
Laszlo

>> -----Original Message-----
>> From: Laszlo Ersek <lersek@redhat.com>
>> Sent: Thursday, October 31, 2019 2:55 AM
>> To: devel@edk2.groups.io; Kinney, Michael D
>> <michael.d.kinney@intel.com>
>> Cc: Sean Brogan <sean.brogan@microsoft.com>; Bret
>> Barkelew <Bret.Barkelew@microsoft.com>; Gao, Liming
>> <liming.gao@intel.com>; Feng, Bob C
>> <bob.c.feng@intel.com>; Andrew Fish <afish@apple.com>;
>> Leif Lindholm <leif.lindholm@linaro.org>; Wang, Jian J
>> <jian.j.wang@intel.com>; Lu, XiaoyuX
>> <xiaoyux.lu@intel.com>; Ni, Ray <ray.ni@intel.com>; Wu,
>> Hao A <hao.a.wu@intel.com>; Wu, Jiaxin
>> <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>;
>> Yao, Jiewen <jiewen.yao@intel.com>; Zhang, Chao B
>> <chao.b.zhang@intel.com>; Gao, Zhichao
>> <zhichao.gao@intel.com>; Dong, Eric
>> <eric.dong@intel.com>
>> Subject: Re: [edk2-devel] [Patch v3 00/22] Enable Phase
>> 1 of EDK II CI
>>
>> On 10/29/19 20:54, Michael D Kinney wrote:
>>
>>> Active branch for testing/evaluation:
>>> * https://github.com/tianocore/edk2-staging/tree/edk2-
>> ci
>>> * To test, fork edk2-staging repo, create a branch
>> with a change, and submit
>>>   a pull request targeting edk2-staging/edk2-ci.
>> NOTE: the default branch for
>>>   the edk2-staging is 'about'.  You must select the
>> 'edk2-ci' branch when
>>>   a pull request is opened.  Set the 'push' label to
>> require commit if all
>>>   checks pass.
>>
>> The edk2-staging repository has been added as a "git
>> remote" to my local
>> edk2 clone for a long while now. Using the local
>> identifier "staging".
>> (This makes perfect sense as edk2-staging is itself a
>> fork of edk2, with branches that are supposed to be
>> rebased to edk2/master periodically.)
>>
>> Furthermore, the identifier by which I refer to the
>> remote at <https://github.com/lersek/edk2.git> is
>> "lersek".
>>
>> I've now run the following commands:
>>
>> $ git fetch staging
>> $ git checkout -b ci-test-1 staging/edk2-ci
>>
>> [modify "SampleFile.txt"]
>>
>> $ git add -p
>> $ git commit
>> $ git push lersek ci-test-1
>>
>> Questions:
>>
>> (a) How can I submit a pull request for the staging
>> repo's edk2-ci branch using the command line (and set
>> the "push" label)?
>>
>> (b) How can I submit a PR for the staging repo's edk2-ci
>> branch (regardless of command line vs. WebUI usage)
>> against my <https://github.com/lersek/edk2.git>
>> repository?
>>
>> When I go to the WebUI, the PR view does not offer
>> "tianocore/edk2-staging" as "base repository", it only
>> offers "tianocore/edk2". I thought I'd be able to pick
>> any destination repository at all.
>>
>> By the instruction "fork edk2-staging repo", did you
>> mean we should fork edk2-staging *on github*? (Using the
>> WebUI?)
>>
>> Thanks!
>> Laszlo
>