Closed Bug 1424386 Opened 3 years ago Closed 3 years ago

Update Docker images to Mercurial 4.4

Categories

(Firefox Build System :: Task Configuration, task)

Product:
Firefox Build System
Component:
Task Configuration
Type:
task
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED
Milestone:
mozilla59

People

(Reporter: gps, Assigned: sheehan)

References

Details

Attachments

(2 files)

Bug 1424386: Update Docker images to Mercurial 4.4
59 bytes, text/x-review-board-request
gps
: review+
Details
Bug 1424386: Update robustcheckout in m-c with latest version from v-c-t
59 bytes, text/x-review-board-request
gps
: review+
Details 
Docker images used by Firefox CI are running Mercurial 4.3.1 (https://hg.mozilla.org/mozilla-central/file/tip/taskcluster/docker/recipes/install-mercurial.sh). We should upgrade to 4.4.2 (or newer if this bug lingers).
The last time we did an upgrade was in bug 1389715. The patches there should be an example of what to do this time around.
Depends on: 1389715
Assignee: nobody → sheehan
I produced and uploaded Mercurial 4.4.2 artifacts to tooltool.

[
  {
    "size": 193710,
    "visibility": "public",
    "digest": "458746bd82b4732c72c611f1041f77a47a683bc75ff3f6ab7ed86ea394f48d94cd7e2d3d1d5b020906318a9a24bea27401a3a63d7e645514dbc2cb581621977f",
    "algorithm": "sha512",
    "filename": "mercurial_4.4.2_amd64.deb"
  },
  {
    "size": 5328414,
    "visibility": "public",
    "digest": "0e7f058c2acb014213afffd4372e312cee4f24f20b21a9100b2022f4df8fa7c013c56745cc0472e2edba882abb8d15d0266fd105b9b7f61e1773f2bccdab413a",
    "algorithm": "sha512",
    "filename": "mercurial_4.4.2.orig.tar.gz"
  },
  {
    "size": 2097892,
    "visibility": "public",
    "digest": "8074efbfff974f0bbdd0c3be3d272cc7a634456921e04db31369fbec1c9256ddaf44bdbe120f6f33113d2be9324a1537048028ebaaf205c6659e476a757358fd",
    "algorithm": "sha512",
    "filename": "mercurial-common_4.4.2_all.deb"
  }
]
Comment on attachment 8937628 [details]
Bug 1424386: Update Docker images to Mercurial 4.4

https://reviewboard.mozilla.org/r/208304/#review214050

::: taskcluster/docker/recipes/install-mercurial.sh:106
(Diff revision 1)
>  [
>    {
> -    "size": 5475042,
> -    "digest": "4c42d06b7f111a3e825dd927704a30f88f0b2225cf87ab8954bf53a7fbc0edf561374dd49b13d9c10140d98ff5853a64acb5a744349727abae81d32da401922b",
> +    "size": 5328414,
> +    "digest": "0e7f058c2acb014213afffd4372e312cee4f24f20b21a9100b2022f4df8fa7c013c56745cc0472e2edba882abb8d15d0266fd105b9b7f61e1773f2bccdab413a",
>      "algorithm": "sha512",
> -    "filename": "mercurial-4.3.1.tar.gz"
> +    "filename": "mercurial_4.4.2.orig.tar.gz"

You don't need to change the filename here. But it doesn't matter: the end result is the same.

Although, this /may/ be using the wrong Mercurial tarball. I /think/ the tarball uploaded earlier is a Debian flavored tarball whereas this wants a Python source distribution tarball. Let's see what happens with the Try push...
Comment on attachment 8937628 [details]
Bug 1424386: Update Docker images to Mercurial 4.4

https://reviewboard.mozilla.org/r/208304/#review214050

> You don't need to change the filename here. But it doesn't matter: the end result is the same.
> 
> Although, this /may/ be using the wrong Mercurial tarball. I /think/ the tarball uploaded earlier is a Debian flavored tarball whereas this wants a Python source distribution tarball. Let's see what happens with the Try push...

Yeah, let's use this for the source distribution:

```
[
  {
    "size": 5647013,
    "digest": "3d1d103689eac4f50cc1005be44144b37d75ebfac3ff3b4fc90d6f41fbee46e107a168d04f2c366ce7cca2733ea4e5b5127df462af8e253f61a72f8938833993",
    "algorithm": "sha512",
    "filename": "mercurial-4.4.2.tar.gz"
  }
]
```
Comment on attachment 8937628 [details]
Bug 1424386: Update Docker images to Mercurial 4.4

https://reviewboard.mozilla.org/r/208304/#review214054

This gets a r- because the Try push failed. Using the proper tar.gz should fix it. Sorry about the confusion.
Attachment #8937628 - Flags: review?(gps) → review-
Comment on attachment 8937628 [details]
Bug 1424386: Update Docker images to Mercurial 4.4

https://reviewboard.mozilla.org/r/208304/#review214242

::: taskcluster/docker/recipes/install-mercurial.sh:111
(Diff revision 2)
> -    "filename": "mercurial-4.3.1.tar.gz"
> +    "filename": "mercurial-4.4.2.tar.gz"
>    }
>  ]
>  EOF
>  
> -   ${PIP_PATH} install mercurial-4.3.1.tar.gz
> +   ${PIP_PATH} install mercurial-4.4.2.orig.tar.gz

Remove the `.orig`.
Attachment #8937628 - Flags: review?(gps) → review-
Comment on attachment 8937628 [details]
Bug 1424386: Update Docker images to Mercurial 4.4

https://reviewboard.mozilla.org/r/208304/#review214358

This looks good! I'll wait for the Try push to have a little more green before landing this.
Attachment #8937628 - Flags: review?(gps) → review+
If you look at the Try push at https://treeherder.mozilla.org/#/jobs?repo=try&revision=914ff52c2fd8ecfb694985e658406b0b4718b583, it appears that robustcheckout is complaining.

You'll need to update the copy of robustcheckout.py in mozilla-central with the latest version from version-control-tools. See https://hg.mozilla.org/mozilla-central/rev/e2707fdbeb05 for inspiration.
Flags: needinfo?(sheehan)
I think you may have meant https://hg.mozilla.org/hgcustom/version-control-tools/rev/4a274fa605f1 :)

Test failures on previous try push seem to have passed now https://treeherder.mozilla.org/#/jobs?repo=try&revision=7ca692f8fa0f2d872c277d398e6f9c03b3170892
Flags: needinfo?(sheehan)
Comment on attachment 8938006 [details]
Bug 1424386: Update robustcheckout in m-c with latest version from v-c-t

https://reviewboard.mozilla.org/r/208736/#review214494
Attachment #8938006 - Flags: review?(gps) → review+
Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/977768c296ca
Update Docker images to Mercurial 4.4 r=gps
https://hg.mozilla.org/integration/autoland/rev/62b281c39548
Update robustcheckout in m-c with latest version from v-c-t r=gps
https://hg.mozilla.org/mozilla-central/rev/977768c296ca
https://hg.mozilla.org/mozilla-central/rev/62b281c39548
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla59
Product: TaskCluster → Firefox Build System
You need to log in before you can comment on or make changes to this bug.