Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.45] Backport ignore chown errors in additionalimagestore #1992

Merged

Conversation

TomSweeneyRedHat
Copy link
Member

Backports parts of #1828 and also #1784 to address:
https://issues.redhat.com/browse/ACCELFIX-244

instead of removing the "merged" directory, replace it with a fresh
empty directory so that we can assume "merged" is always present and
there is no need to recreate it.

Signed-off-by: Giuseppe Scrivano <[email protected]>
ignore errors creating and chowning the diffDiff if it is in an
additional image store.

Signed-off-by: Giuseppe Scrivano <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
Bump lint in the test area to 1.55.2 and then address an
append that's causing lint heartache.  Also change the install
process for lint to be like the latest releases.

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat
Copy link
Member Author

Lint is failing here trying to get to to Debian:

Err:5 http://deb.debian.org/debian stretch-backports Release
  404  Not Found [IP: 199.232.98.132 80]

I thought at first that it was due to the changes I made to the lint install in tests/Makefile, but I reverted that and the same error. @cevich or @lsm5 are you aware of issues in this arena?

@edsantiago
Copy link
Member

Looks hopeless

echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list
apt-get update
Get:1 http://deb.debian.org/debian bullseye InRelease [116 kB]
Get:2 http://deb.debian.org/debian-security bullseye-security InRelease [48.4 kB]
Get:3 http://deb.debian.org/debian bullseye-updates InRelease [44.1 kB]
Ign:4 http://deb.debian.org/debian stretch-backports InRelease
Err:5 http://deb.debian.org/debian stretch-backports Release
  404  Not Found [IP: 199.232.98.132 80]
Get:6 http://deb.debian.org/debian bullseye/main amd64 Packages [8068 kB]
Get:7 http://deb.debian.org/debian-security bullseye-security/main amd64 Packages [278 kB]
Get:8 http://deb.debian.org/debian bullseye-updates/main amd64 Packages [18.8 kB]
Reading package lists...
E: The repository 'http://deb.debian.org/debian stretch-backports Release' does not have a Release file.

I would just disable lint. This code is too old.

@rhatdan
Copy link
Member

rhatdan commented Jul 1, 2024

Agree, disable lint.

In containers#1992 there were a
number of lint issues that were not solvable.  After consulting
with @edsantiago and @rhatdan, it was decided to remove the
line processing from this branch.

Signed-off-by: tomsweeneyredhat <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Jul 11, 2024

LGTM

@rhatdan
Copy link
Member

rhatdan commented Jul 11, 2024

/approve
/lgtm

Copy link
Contributor

openshift-ci bot commented Jul 11, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rhatdan, TomSweeneyRedHat

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rhatdan rhatdan merged commit cf9d544 into containers:release-1.45 Jul 11, 2024
11 of 12 checks passed
TomSweeneyRedHat added a commit to TomSweeneyRedHat/storage that referenced this pull request Jul 12, 2024
As the title says.

In the last bump of c/storage in this branch, it was 1.45.7-dev and I should
have bumped to 1.45.7, instead I skipped 7 and went to 1.45.8. See containers#1992

This corrects that.

Signed-off-by: tomsweeneyredhat <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants