Merge ~bryce/ubuntu/+source/nginx:merge-v1.22.1-7-mantic into ubuntu/+source/nginx:debian/sid
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | git-ubuntu bot | ||||
| Approved revision: | not available | ||||
| Merge reported by: | git-ubuntu bot | ||||
| Merged at revision: | 076781bf4bde3a4b725b22f137b2a53f71088dd5 | ||||
| Proposed branch: | ~bryce/ubuntu/+source/nginx:merge-v1.22.1-7-mantic | ||||
| Merge into: | ubuntu/+source/nginx:debian/sid | ||||
| Diff against target: |
2001 lines (+1706/-2) (has conflicts) 6 files modified
debian/changelog (+1656/-0) debian/control (+2/-2) debian/patches/series (+4/-0) debian/patches/ubuntu-branding.patch (+28/-0) debian/tests/branding (+12/-0) debian/tests/control (+4/-0) Conflict in debian/changelog |
||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| git-ubuntu bot | Approve | ||
| Athos Ribeiro (community) | Approve | ||
| Canonical Server Reporter | Pending | ||
| Canonical Server | Pending | ||
| Canonical Server Core Reviewers | Pending | ||
|
Review via email:
|
|||
Description of the change
We've been carrying a lot of delta to exclude modules that depend on things in universe. Debian has been working at redoing the packaging to break out modules as separate binary debs. This should allow us to drop much of our delta (pretty much everything except branding).
Note this merges version 1.22.1-7, rather than the current Debian 1.22.1-9. No reason for that but laziness since I prepared this MP during lunar. I expect to re-merge later and so will pick up more changes later. However if you feel strongly this should be up to date with debian let me know and I can update the MP to pull the latest. (This is what causes the diff markers in the changelog)
The package builds ok in PPA (against lunar):
https:/
However, part of the packaging split out involves introducing a spate of new nginx modules, which there wasn't time to get transitioned for lunar. The trouble is that nginx's tests depend on those modules (since it runs tests against them) but the modules build-depend on this new nginx. So, the autopkgtests for this MP are going to fail, but we need to proceed anyway so we can get the modules built, then circle back and retrigger everything to transition.
For example, (and for a bit TMI) the arm64 failures are (on lunar):
- nginx/1.
+ ❌ nginx on lunar for amd64 @ 24.02.23 11:15:09 Log️ 🗒️
• light-simple FAIL 🟥
• branding FAIL 🟥
• ec-x25519 FAIL 🟥
• core-simple PASS 🟩
• full-simple FAIL 🟥
• extras-simple FAIL 🟥
• core-module-deps FAIL 🟥
• full-module-deps FAIL 🟥
• light-module-deps FAIL 🟥
• extras-module-deps FAIL 🟥
• reboot FAIL 🟥
• ssi-module-test PASS 🟩
The actual error logs all look like the following snippet:
-------
Investigating (0) nginx-light:amd64 < none -> 1.22.1-
Broken nginx-light:amd64 Depends on libnginx-
Broken nginx-light:amd64 Depends on nginx:amd64 < none | 1.22.1-
Considering nginx:amd64 0 as a solution to nginx-light:amd64 9999
Re-Instated nginx:amd64
Done
curl is already the newest version (7.87.0-1ubuntu1).
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:
The following packages have unmet dependencies:
nginx-light : Depends: libnginx-
E: Unable to correct problems, you have held broken packages.
autopkgtest [11:01:34]: test ssi-module-test: preparing testbed
reboot FAIL badpkg
blame: nginx
badpkg: Test dependencies are unsatisfiable. A common reason is that your testbed is out of date with respect to the archive, and you need to use a current testbed or run apt-get update or use -U.
-------
Anyway, so please focus review on the packaging work not on the autopkgtests; those will be tended to later.
| Athos Ribeiro (athos-ribeiro) wrote | # |
| Bryce Harrington (bryce) wrote | # |
| Bryce Harrington (bryce) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Hi Bryce,
Sorry for the delay to get to this one.
While I am going through the changes, I have an initial question:
You mentioned that you were able to drop all the delta but our branding. However, as shown by
git diff pkg/import/
the topmost commit,
disable lua @ 7c00ba3
is also there.
If this is supposed to stay, then do we want a changelog entry for it? I still did not check on which step of the merge this one was introduced. I will come back soon with a full/proper review :)