[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
Re: [cross-project-issues-dev] SimRel - direct push to master has been disabled
|
- From: Frederic Gurr <frederic.gurr@xxxxxxxxxxxxxxxxxxxxxx>
- Date: Tue, 13 Nov 2018 10:45:34 +0100
- Autocrypt: addr=frederic.gurr@xxxxxxxxxxxxxxxxxxxxxx; prefer-encrypt=mutual; keydata= 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 kr0KPtEgdm15rQ8tiPH8bKZLHQ5e/2Li
- Delivered-to: cross-project-issues-dev@xxxxxxxxxxx
- List-archive: <https://www.eclipse.org/mailman/private/cross-project-issues-dev>
- List-help: <mailto:cross-project-issues-dev-request@eclipse.org?subject=help>
- List-subscribe: <https://www.eclipse.org/mailman/listinfo/cross-project-issues-dev>, <mailto:cross-project-issues-dev-request@eclipse.org?subject=subscribe>
- List-unsubscribe: <https://www.eclipse.org/mailman/options/cross-project-issues-dev>, <mailto:cross-project-issues-dev-request@eclipse.org?subject=unsubscribe>
- Openpgp: preference=signencrypt
- Organization: Eclipse Foundation
- User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1
Hi,
I have changed the submit type to "fast-forward only" for the
simrel/org.eclipse.simrel.build repo.
Regards,
Fred
On 13.11.18 10:10, Ed Merks wrote:
> Jonah,
>
> +1 for fast-forward-only
>
> In principle that could force one to rebase and then kick off another CI
> Bot verification job, but that's not so likely to occur much in practice.
>
> Cheers,
> Ed
>
>
> On 13.11.2018 09:55, Jonah Graham wrote:
>> Hi Ed,
>>
>> If you want you can do a "Rebase" in the Gerrit UI before doing the
>> Submit.
>>
>> Alternatively, and what I personally prefer is to set gerrit's merge
>> strategy to either Fast forward only, or rebase. The Eclipse platform
>> uses fast forward only. This prevents any merge commits and ensures
>> that the gerrit tests the same version as is pushed. The merge
>> strategy is a admin preference on the repo, so something that
>> webmaster/Fred would have to change IIRC.
>>
>> HTH,
>> Jonah
>>
>>
>> ~~~
>> Jonah Graham
>> Kichwa Coders Ltd.
>> www.kichwacoders.com <http://www.kichwacoders.com>
>>
>>
>> On Tue, 13 Nov 2018 at 08:38, Ed Willink <ed@xxxxxxxxxxxxx
>> <mailto:ed@xxxxxxxxxxxxx>> wrote:
>>
>> Hi
>>
>> Ah! It never occurred to me that "Reply" meant "Commit" / "Push" /
>> "Merge" or even "Review". I saw only "Cherry Pick" / " Cancel"
>> which did not match my requirements. What a truly awful UI.
>>
>> What if I don't want to "Merge" since it leads to double history
>> entries that on normal projects are difficult to disentangle? Ok,
>> SimRel commits are highly orthogonal. But Push gives a nice clean
>> history and forces a Rebase that just occasionally Merge can fail
>> to replicate. IMHO if a Merge is necessary the Gerrit Review
>> should iterate.
>>
>> Regards
>>
>> Ed Willink
>>
>>
>> On 13/11/2018 05:46, Ed Merks wrote:
>>>
>>> Ed,
>>>
>>> Normally you would use the Gerrit review link to finish the
>>> processing. E.g., for the last commit I used this link:
>>>
>>> https://git.eclipse.org/r/#/c/132049/
>>>
>>> After the initial commit, I waited for the build to finish so
>>> that CI Bot (one of the automatic reviewers) adds a +1. That
>>> takes about 5 minutes. Then I used the Reply... (or the Review
>>> +2 button, which will be there after the successful build) to
>>> make it possible to "Submit" the changes to master, i.e., the
>>> Submit button will be there once all the reviewers (CI Bot and
>>> you) have voted the changes up to the necessary level.
>>>
>>> So the chain of events looks like this in the review:
>>>
>>> After submitting, when I do a pull on the repo, my changes are
>>> pulled and the repo is up-to-date (no longer one commit behind
>>> master).
>>>
>>> I believe a non-dilegent user could remove CI Bot from the review
>>> to submit their changes even when those did not pass the
>>> aggregation build but it appears to me that there really is no
>>> good reason to allow direct push to master as a way to completely
>>> bypass the CI Bot review.
>>>
>>> Regards,
>>> Ed
>>>
>>>
>>> On 12.11.2018 22:04, Ed Willink wrote:
>>>> Hi
>>>>
>>>> Sorry I must have missed something. My no doubt flawed
>>>> recollection was that we were assured (again) that direct push
>>>> would continue to be allowed.
>>>>
>>>> I certainly use it every time since I see no other way to do it.
>>>>
>>>> I push to Gerrit, check for build success, then Push to master.
>>>>
>>>> Given that the bulk of failures are surely due to those updating
>>>> magic 'latest' contributions without any commit, why change the
>>>> rules for more diligent users?
>>>>
>>>> Regards
>>>>
>>>> Ed Willink
>>>>
>>>>
>>>>
>>>> On 12/11/2018 17:34, Frederic Gurr wrote:
>>>>> Hi,
>>>>>
>>>>> As discussed before, direct push to master for the SimRel
>>>>> aggregation
>>>>> build repository
>>>>> (https://git.eclipse.org/r/simrel/org.eclipse.simrel.build) has
>>>>> been
>>>>> disabled. So, all future commits have to go through a Gerrit
>>>>> review and
>>>>> should get a +1 from the CI server before being merged.
>>>>>
>>>>> The reasoning behind this is, that commits directly pushed to
>>>>> master
>>>>> caused build failures and delays in the past.
>>>>>
>>>>> Please let me know, if you have any questions or concerns.
>>>>>
>>>>> Regards,
>>>>>
>>>>> Fred
>>>>>
>>>>
>>>>
>>>> ---
>>>> This email has been checked for viruses by Avast antivirus
>>>> software.
>>>> https://www.avast.com/antivirus
>>>>
>>>> _______________________________________________
>>>> cross-project-issues-dev mailing list
>>>> cross-project-issues-dev@xxxxxxxxxxx
>>>> <mailto:cross-project-issues-dev@xxxxxxxxxxx>
>>>> To change your delivery options, retrieve your password, or
>>>> unsubscribe from this list, visit
>>>> https://www.eclipse.org/mailman/listinfo/cross-project-issues-dev
>>>
>>>
>>>
>>> _______________________________________________
>>> cross-project-issues-dev mailing list
>>> cross-project-issues-dev@xxxxxxxxxxx <mailto:cross-project-issues-dev@xxxxxxxxxxx>
>>> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
>>> https://www.eclipse.org/mailman/listinfo/cross-project-issues-dev
>>
>>
>> <https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
>> Virus-free. www.avast.com
>> <https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>
>>
>>
>> <#m_-916945580506975019_DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
>> _______________________________________________
>> cross-project-issues-dev mailing list
>> cross-project-issues-dev@xxxxxxxxxxx
>> <mailto:cross-project-issues-dev@xxxxxxxxxxx>
>> To change your delivery options, retrieve your password, or
>> unsubscribe from this list, visit
>> https://www.eclipse.org/mailman/listinfo/cross-project-issues-dev
>>
>>
>>
>> _______________________________________________
>> cross-project-issues-dev mailing list
>> cross-project-issues-dev@xxxxxxxxxxx
>> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
>> https://www.eclipse.org/mailman/listinfo/cross-project-issues-dev
>
>
> _______________________________________________
> cross-project-issues-dev mailing list
> cross-project-issues-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://www.eclipse.org/mailman/listinfo/cross-project-issues-dev
>
--
Frederic Gurr
Release Engineer | Eclipse Foundation Europe GmbH
Annastr. 46, D-64673 Zwingenberg
Handelsregister: Darmstadt HRB 92821
Managing Directors: Ralph Mueller, Mike Milinkovich, Chris Laroque