From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web10.5936.1572691804576549658 for ; Sat, 02 Nov 2019 03:50:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dP1OZxwB; spf=pass (domain: redhat.com, ip: 205.139.110.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572691803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=umKwrkrTERnZrODxAwP0/HtGQVeo9t9mFBzDmzpze1w=; b=dP1OZxwBROM0AyXTFOTEbnBdbm/Y+f3vuFb9xyP250TqKeFpf3mOo5DUx5jlmEwCuY8kTI xefNIH9wnRNS6Z6d9GukCYJAXyEK4HQGVkJQZMNHVwDTrqsSF7ce5JpHDmYkpLymA4W/p+ hrKpZDgcZqRw0Sj3zqJ1MPI0CRix2bE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-mwasCobCOguJfE2OxBVR9A-1; Sat, 02 Nov 2019 06:49:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 473E31005500; Sat, 2 Nov 2019 10:49:56 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-108.ams2.redhat.com [10.36.116.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id D81DA60126; Sat, 2 Nov 2019 10:49:49 +0000 (UTC) Subject: Re: [edk2-devel] [Patch v3 00/22] Enable Phase 1 of EDK II CI To: "Kinney, Michael D" , "devel@edk2.groups.io" Cc: Sean Brogan , Bret Barkelew , "Gao, Liming" , "Feng, Bob C" , Andrew Fish , Leif Lindholm , "Wang, Jian J" , "Lu, XiaoyuX" , "Ni, Ray" , "Wu, Hao A" , "Wu, Jiaxin" , "Fu, Siyuan" , "Yao, Jiewen" , "Zhang, Chao B" , "Gao, Zhichao" , "Dong, Eric" References: <20191029195517.20028-1-michael.d.kinney@intel.com> From: "Laszlo Ersek" Message-ID: <3ee2e751-5a1c-f5f1-baf0-3ca70e86e86d@redhat.com> Date: Sat, 2 Nov 2019 11:49:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: mwasCobCOguJfE2OxBVR9A-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 11/02/19 01:32, Kinney, Michael D wrote: > Hi Laszlo, >=20 > Everything is back online now. Will be doing more extensive > CI unit tests next. Thanks! I've submitted now. > If there is a merge conflict at the time the PR is submitted > you should be notified by email. I think you ran into what > should be an impossible case when the service is running > correctly. The fact it was not auto merging push requests > at the time you sent your PR allowed other pushes to make > it in. >=20 > You should have since received an email that says: >=20 > "PR can not be merged due to conflict. Please rebase and resubmit" That's indeed the case. (See my other email.) > This came from the Mergify CI service when it was re-activated > And noticed the conflict. Thanks! Laszlo >> -----Original Message----- >> From: Laszlo Ersek >> Sent: Friday, November 1, 2019 3:40 PM >> To: Kinney, Michael D ; >> devel@edk2.groups.io >> Cc: Sean Brogan ; Bret >> Barkelew ; Gao, Liming >> ; Feng, Bob C >> ; Andrew Fish ; >> Leif Lindholm ; Wang, Jian J >> ; Lu, XiaoyuX >> ; Ni, Ray ; Wu, >> Hao A ; Wu, Jiaxin >> ; Fu, Siyuan ; >> Yao, Jiewen ; Zhang, Chao B >> ; Gao, Zhichao >> ; Dong, Eric >> >> Subject: Re: [edk2-devel] [Patch v3 00/22] Enable Phase >> 1 of EDK II CI >> >> Hi Mike, >> >> On 11/01/19 06:03, Kinney, Michael D wrote: >>> Hi Laszlo, >>> >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> 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. >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> >>> 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 >>>> Sent: Thursday, October 31, 2019 2:55 AM >>>> To: devel@edk2.groups.io; Kinney, Michael D >>>> >>>> Cc: Sean Brogan ; Bret >> Barkelew >>>> ; Gao, Liming >> ; >>>> Feng, Bob C ; Andrew Fish >> ; >>>> Leif Lindholm ; Wang, Jian >> J >>>> ; Lu, XiaoyuX >> ; Ni, Ray >>>> ; Wu, Hao A ; >> Wu, Jiaxin >>>> ; Fu, Siyuan >> ; Yao, Jiewen >>>> ; Zhang, Chao B >> ; Gao, >>>> Zhichao ; Dong, Eric >> >>>> 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 >>>> 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 >>>> >>>> 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 >>> >=20