Closed Bug 1448438 Opened 2 years ago Closed 2 years ago

Install and use Mercurial 4.5 in CI

Categories

(Firefox Build System :: Task Configuration, task)

3 Branch
task
Not set

Tracking

(firefox-esr60 fixed, firefox61 fixed)

RESOLVED FIXED
mozilla61
Tracking Status
firefox-esr60 --- fixed
firefox61 --- fixed

People

(Reporter: gps, Assigned: gps)

References

(Blocks 1 open bug)

Details

Attachments

(4 files)

No description provided.
Blocks: 1371378
Comment on attachment 8961929 [details]
Bug 1448438 - Install Mercurial via install-mercurial.sh;

https://reviewboard.mozilla.org/r/230758/#review236240

::: taskcluster/docker/periodic-updates/Dockerfile:19
(Diff revision 1)
> +COPY topsrcdir/taskcluster/docker/recipes/hgrc /etc/mercurial/hgrc.d/mozilla.rc
> +
> +# %include taskcluster/docker/recipes/install-mercurial.sh
> +ADD topsrcdir/taskcluster/docker/recipes/install-mercurial.sh /tmp/install-mercurial.sh
> +
> +RUN /tmp/install-mercurial.sh && rm -f /tmp/tooltool.py /tmp/install-mercurial.sh

I lean toward running this after the apt-get command below, incase we need things like bzip2, wget, unzip (which are only added below) But if they are not needed for install-mercurial I'm not going to oppose.
Attachment #8961929 - Flags: review?(bugspam.Callek) → review+
Comment on attachment 8961929 [details]
Bug 1448438 - Install Mercurial via install-mercurial.sh;

https://reviewboard.mozilla.org/r/230758/#review236240

> I lean toward running this after the apt-get command below, incase we need things like bzip2, wget, unzip (which are only added below) But if they are not needed for install-mercurial I'm not going to oppose.

Those things are *not* needed. Although I may still reorder things depending on what Try says. I have yet to get a working Docker image build because of the bionic compatibility issue.
Comment on attachment 8961914 [details]
Bug 1448438 - Document how to upgrade Mercurial in CI;

https://reviewboard.mozilla.org/r/230748/#review236288
Attachment #8961914 - Flags: review?(sheehan) → review+
Comment on attachment 8961912 [details]
Bug 1448438 - Update to latest robustcheckout;

https://reviewboard.mozilla.org/r/230744/#review236294
Attachment #8961912 - Flags: review?(sheehan) → review+
Comment on attachment 8961913 [details]
Bug 1448438 - Upgrade to Mercurial 4.5.2;

https://reviewboard.mozilla.org/r/230746/#review236296
Attachment #8961913 - Flags: review?(sheehan) → review+
Comment on attachment 8961914 [details]
Bug 1448438 - Document how to upgrade Mercurial in CI;

https://reviewboard.mozilla.org/r/230748/#review236300
Comment on attachment 8961929 [details]
Bug 1448438 - Install Mercurial via install-mercurial.sh;

This changed substantially and will need a re-review.
Attachment #8961929 - Flags: review+ → review?(bugspam.Callek)
Comment on attachment 8961929 [details]
Bug 1448438 - Install Mercurial via install-mercurial.sh;

https://reviewboard.mozilla.org/r/230758/#review236326

I also note that while your commit message says you unpinned packages, there are still a bunch of packages that are pinned here.

::: taskcluster/docker/periodic-updates/setup.sh:27
(Diff revision 3)
> +    jq=1.5+dfsg-2 \
> +    libdbus-glib-1-2=0.110-2 \
> +    libgtk-3-0=3.22.28-1ubuntu3 \
> +    libxml2-utils=2.9.4+dfsg1-6.1ubuntu1 \
> +    libxt6=1:1.1.5-1 \
> +    python \

I have a slight concern that you're adding `python` here, which wasn't in the original setup.

That said, I don't forsee there being an issue here (unless, weirdly we're trying to run python3 by `python` and py2 installs with that bare word.)

I'll f? Simon who effectively owns this docker image in the bug to make him aware of it, but otherwise I'm good to have you land this.
Attachment #8961929 - Flags: review?(bugspam.Callek) → review+
Attachment #8961929 - Flags: feedback?(sfraser)
Comment on attachment 8961929 [details]
Bug 1448438 - Install Mercurial via install-mercurial.sh;

https://reviewboard.mozilla.org/r/230758/#review236326

> I have a slight concern that you're adding `python` here, which wasn't in the original setup.
> 
> That said, I don't forsee there being an issue here (unless, weirdly we're trying to run python3 by `python` and py2 installs with that bare word.)
> 
> I'll f? Simon who effectively owns this docker image in the bug to make him aware of it, but otherwise I'm good to have you land this.

AFAIK Ubuntu *never* aliases Python 3 to `python`. `python` will always be 2.7. Also, the `python` package was a dependency of the `mercurial` package. Since we're now installing Mercurial directly from a `.deb`, we have to install the dependency manually. (`install-mercurial.sh` doesn't take care of that for better or worse.)
Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/3f48d730ddaa
Install Mercurial via install-mercurial.sh; r=Callek
https://hg.mozilla.org/integration/autoland/rev/4ca1c7b0cb8c
Update to latest robustcheckout; r=sheehan
https://hg.mozilla.org/integration/autoland/rev/7ba920a2bd08
Upgrade to Mercurial 4.5.2; r=sheehan
https://hg.mozilla.org/integration/autoland/rev/aa9619c9f6a2
Document how to upgrade Mercurial in CI; r=sheehan
Comment on attachment 8961929 [details]
Bug 1448438 - Install Mercurial via install-mercurial.sh;

https://reviewboard.mozilla.org/r/230758/#review236532

I'd like to get version pinning back in somehow - we've been bitten by things being updated silently. Otherwise, looks good, thank you for the changes
Attachment #8961929 - Flags: review+
Attachment #8961929 - Flags: feedback?(sfraser)
Version: Version 3 → 3 Branch
You need to log in before you can comment on or make changes to this bug.