Ubuntu
squid package

Merge ~athos-ribeiro/ubuntu/+source/squid:halt-build-on-test-failures-kinetic into ubuntu/+source/squid:ubuntu/kinetic-devel

  1. Git
  2. lp:~athos-ribeiro/ubuntu/+source/squid
  3. halt-build-on-test-failures-kinetic
  4. Merge into ubuntu/kinetic-devel
Proposed by Athos Ribeiro
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merged at revision: 4dbcd05f140564b189e6d0789ba52d90e0d98fc7
Proposed branch: ~athos-ribeiro/ubuntu/+source/squid:halt-build-on-test-failures-kinetic
Merge into: ubuntu/+source/squid:ubuntu/kinetic-devel
Diff against target: 122 lines (+35/-33)
5 files modified
debian/changelog (+16/-0)
debian/patches/series (+0/-1)
debian/rules (+15/-2)
debian/tests/upstream-test-suite (+4/-0)
dev/null (+0/-30)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Bryce Harrington (community) Approve
Canonical Server Reporter Pending
Review via email: mp+438831@code.staging.launchpad.net

This proposal supersedes a proposal from 2023-02-03.

Description of the change

I am re-submitting these kinetic changes to include vorlon's suggestions raised during the SRU review in LP: #2004050.

The relevant changes are
- Disabling specific compiler errors instead of disabling LTO in s390x
- Removing patch instead of commenting it out in d/p/series to ease SRU review process.

As it is being discussed in [1], squid builds will not halt upon upstream unit test failures during dh_auto_test. This could hinder the squid MRE test plan process [2].

This MP proposes a patch set to force squid builds to fail upon test failures. It also includes additional changes to ensure build time and autopkgtests are also passing for those upstream tests.

This is the kinetic SRU for the change applied in lunar in [3]

[1] https://lists.ubuntu.com/archives/ubuntu-release/2023-January/005522.html
[2] https://wiki.ubuntu.com/SquidUpdates
PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/squid-halt-build-on-test-failures/+packages
[3] https://code.launchpad.net/~athos-ribeiro/ubuntu/+source/squid/+git/squid/+merge/436437

To post a comment you must log in.
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote : Posted in a previous version of this proposal

Note that I already have

- verified that the s390x LTO change is needed here; and
- tested a build without removing the 0003 patch, which did lead to a build failure due to failing tests, as expected.

Revision history for this message
Bryce Harrington (bryce) wrote : Posted in a previous version of this proposal

Should this be targeting the applied branch? Or am I confused?

With this targeting kinetic, should version number be 5.6-1ubuntu3.1?

review: Needs Fixing
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote : Posted in a previous version of this proposal

Thanks, Bryce!

I fixed the target branch and updated the version string.

Revision history for this message
Bryce Harrington (bryce) wrote : Posted in a previous version of this proposal

Thanks, looks good now!

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote : Posted in a previous version of this proposal

Approvers: athos-ribeiro, bryce
Uploaders: athos-ribeiro, bryce
MP auto-approved

review: Approve
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote : Posted in a previous version of this proposal

Uploaded:

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_5.6-1ubuntu3.1.dsc: done.
  Uploading squid_5.6-1ubuntu3.1.debian.tar.xz: done.
  Uploading squid_5.6-1ubuntu3.1_source.buildinfo: done.
  Uploading squid_5.6-1ubuntu3.1_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Bryce Harrington (bryce) wrote :

The changes themselves LGTM, but the changelog could benefit from some additional clarifications (inline below). With those changes applied, this LGTM.

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: athos-ribeiro, bryce
Uploaders: athos-ribeiro, bryce
MP auto-approved

review: Approve
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Thanks, Bryce!

I updated the changelog (and commit message) as requested; added more information to the SRU bug to describe all the needed changes listed in the changelog; removed the accidental blank line being added to d/rules; and will check if debian would benefit from the s390x specific d/rules bit (that is a workaround for LTO issues).

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Uploaded

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_5.6-1ubuntu3.1.dsc: done.
  Uploading squid_5.6-1ubuntu3.1.debian.tar.xz: done.
  Uploading squid_5.6-1ubuntu3.1_source.buildinfo: done.
  Uploading squid_5.6-1ubuntu3.1_source.changes: done.
Successfully uploaded packages.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches