Pushing M-C changes for try-comm-central build

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Pushing M-C changes for try-comm-central build

ISHIKAWA,chiaki
Can someone enlighten me about the description in
https://wiki.mozilla.org/ReleaseEngineering/ThunderbirdTryServer ?

Specifically, I am using try-comm-central to check my local patches for TB.

The part that looks a bit obscure to me is as follows.:

--- BEGIN Quote
Pushing mozilla-central patches

For TaskCluster builds, modify the .gecko_rev.yml and point
GECKO_HEAD_REPOSITORY to https://hg.mozilla.org/try and also modify
GECKO_HEAD_REF to point to the changeset you previously pushed to M-C's
try with mach try empty. You can also point to
https://hg.mozilla.org/integration/mozilla-inbound or
https://hg.mozilla.org/integration/autoland/ to pick up latest changes
on those repositories.
--- END Quote

 From the look of it, I cannot push mozilla-central patches along with
the C-C push as in the old days.
I think it was like this since some time last year, but it worked in
October if I am not mistaken. (Maybe some tryserver machines had not
been updated not updated then.)

OLD WAY:
Applying the patches to local C-C tree (and M-C tree), then issue the
following. (Note that I use try-comm-central.)

hg push -f ssh://hg.mozilla.org/try-comm-central

M-C portion of the patches were created as files under the top-level of
./comm directory with filenames that start with "M-C-" and the tryserver
framework automagically
picked it up and applied it as M-C patches that are used during build on
try-comm-central.

NEW WAY:
Reading the description, it seems to me that (again note I use
try-comm-central)

1. Firstly,  I need to push mozilla-central the M-C changes. (Not
try-mozilla-central?)
    This means  I need to something like
    - creating M-C patches and then applying to M-C tree locally, and then
    do I submit something like the following at the top mozilla/
directory (as opposed to mozilla/comm directory)?

    hg push -f ssh://hg.mozilla.org/mozilla-central  (or
try-mozilla-central?)
    But what trychooser string should I choose here?

    Or do I simply issue the following command at ./mozilla directory
    ./mach try empty
    mentioned in the original paragraph and can forget about the details
such as which repository and which trychooser string, etc.?

Assume that patches land on M-C tree portion in step 1 (and build??? I
am not even sure what happens there. maybe |empty| suggests just
applying the patches and not try building).

2. Then, I modify mozilla/comm/.gecko_rev.yml, of which first dozen
lines are shown below.:

--- BEGIN  QUOTE: Note "---" on the next line is from .gecko_rev.yml
---
GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/mozilla-central <=== this
should become
https://hg.mozilla.org/try
GECKO_HEAD_REF: default  <=== This should be replaced with the changeset
string returned by the push in step 1, I suppose. [1]

### For comm-central
# GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
# GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/mozilla-central
# GECKO_HEAD_REF: default
#
...
--- END Quote

3. THEN, after applying C-C patches to the local tree, I issue

hg push -f ssh://hg.mozilla.org/try-comm-central

Phew.

A clarification and a concrete example when one uses try-comm-central
would be appreciated.

BTW, |mach try ...| does not work in ./comm subdirectory (known for many
years, I think),
but I am sure it does under ./mozilla directory.

TIA

Chiaki


[1] The changeset string  I mention is something that is returned after
a push to try-comm-central. (well, the following is an example from
try-comm-central, but in the above case, I need to push to
https://hg.mozilla.org/try (?), which I suspect is issued by |mach try
empty|.

E.g. of try-comm-central response after a push.
"91362ab0a588ede7c3de404342d9c9d8f081e066" is changeset string in this
case, I think.

automatically invoking the command
pushing to ssh://hg.mozilla.org/try-comm-central
no revisions specified to push; using . to avoid pushing multiple heads
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: recorded push in pushlog
remote: added 15 changesets with 1 changes to 59 files (+1 heads)
remote:
remote: View the pushlog for these changes here:
remote:
https://hg.mozilla.org/try-comm-central/pushloghtml?changeset=91362ab0a588ede7c3de404342d9c9d8f081e066
remote:
remote: Follow the progress of your build on Treeherder:
remote:
https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=91362ab0a588ede7c3de404342d9c9d8f081e066
remote: recorded changegroup in replication log in 0.013s
no phases changed

_______________________________________________
dev-apps-thunderbird mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-apps-thunderbird
Reply | Threaded
Open this post in threaded view
|

Pushing M-C changes for try-comm-central build

Jörg Knobloch
The description is pretty accurate. You push your m-c patches to m-c's
try without any try syntax (so it doesn't build) and then reference the
try repo and your changeset in the said c-c yml file before pushing the
c-c changes to try-comm-central. I haven't had any luck with mach try
empty, but hg push try works. Other people are doing it, so you can find
examples on try-cc.

--
Sent with FairEmail for Android
https://email.faircode.eu
_______________________________________________
dev-apps-thunderbird mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-apps-thunderbird
Reply | Threaded
Open this post in threaded view
|

Re: Pushing M-C changes for try-comm-central build

ISHIKAWA,chiaki
On 2020/05/18 0:50, Jörg K (Android) wrote:
> The description is pretty accurate. You push your m-c patches to m-c's
> try without any try syntax (so it doesn't build) and then reference
> the try repo and your changeset in the said c-c yml file before
> pushing the c-c changes to try-comm-central. I haven't had any luck
> with mach try empty, but hg push try works. Other people are doing it,
> so you can find examples on try-cc.
>
Thank you for the clarification, Jörg.

- So I don't need any try syntax (no build, just land the patch), and

- |mach try empty| does not work, but hg push try works. (This I suspect
should be invoked at ./mozilla directory).

The change in the said c-c yml file is part of the c-c changes to
try-comm-central if I am not mistaken.

OK, I will look for the change in c-c yml file in try-comm-central to
learn a bit more about other people's usage.

Thank you again.

Chiaki


_______________________________________________
dev-apps-thunderbird mailing list
[hidden email]
https://lists.mozilla.org/listinfo/dev-apps-thunderbird