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

chore(deps): update dependency containers/automation_images to v20240529 #2024

Closed
wants to merge 1 commit into from

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented May 29, 2024

Mend Renovate

This PR contains the following updates:

Package Update Change
containers/automation_images major 20240513t140131z-f40f39d13 -> 20240529t141726z-f40f39d13

Release Notes

containers/automation_images (containers/automation_images)

v20240529t141726z-f40f39d13

Compare Source


Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Mend Renovate. View repository job log here.

@renovate renovate bot added the dependencies Pull requests that update a dependency file label May 29, 2024
@renovate renovate bot requested a review from cevich May 29, 2024 19:50
@edsantiago
Copy link
Member

I think the failure is (log):

ValidateConfig [It] should succeed with default config
/var/tmp/go/src/github.com/containers/common/pkg/config/config_test.go:21
  [FAILED] Expected
      <string>: zstd:chunked
  to be equivalent to
      <string>: gzip
  In [It] at: /var/tmp/go/src/github.com/containers/common/pkg/config/config_test.go:35

Not something I can fix.

@rhatdan
Copy link
Member

rhatdan commented May 30, 2024

This means that the VMs are using the containers.conf from Rawhide?

@rhatdan
Copy link
Member

rhatdan commented May 30, 2024

We probably should change the default in containers.conf to zstd:chunked and then change containers.conf for RHEL and Fedora < 41 to default to gzip.

@rhatdan
Copy link
Member

rhatdan commented May 30, 2024

@giuseppe @Luap99 @mheon @baude WDYT?

@Luap99
Copy link
Member

Luap99 commented May 30, 2024

This count as breaking change to me. The upstream defaults will be consumed by all distros so if we change this in a minor release we could make many people unhappy if it breaks for whatever reasons.

Having a documented process to turn it on for the next fedora release (https://fedoraproject.org/wiki/Changes/zstd:chunked) is fine but forcing this into all distros maybe not so much. Looking at containers/storage#1928 there seem to be cases where it performs much worse currently.

@Luap99
Copy link
Member

Luap99 commented May 30, 2024

Regardless of this specific case unit tests should never depend on installed system configs at all. So the proper fix is to make the unit tests not read system configs and use them to check defaults as this is broken no matter what and true for every config field we have

@giuseppe
Copy link
Member

Regardless of this specific case unit tests should never depend on installed system configs at all. So the proper fix is to make the unit tests not read system configs and use them to check defaults as this is broken no matter what and true for every config field we have

I agree, there is no point in what we are testing now.

Should we just use containers.conf to read the configuration?

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index bacab043..f48c085e 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -21,7 +21,7 @@ var _ = Describe("Config", func() {
                It("should succeed with default config", func() {
                        // Given
                        // When
-                       defaultConfig, err := NewConfig("")
+                       defaultConfig, err := NewConfig("containers.conf")

@Luap99
Copy link
Member

Luap99 commented May 30, 2024

Regardless of this specific case unit tests should never depend on installed system configs at all. So the proper fix is to make the unit tests not read system configs and use them to check defaults as this is broken no matter what and true for every config field we have

NewConfig() still reads all system configs by default + the given path so it doesn't help us here unfortunately.
We could switch directly to defaultConfig() and readConfigFromFile() but then we also loose coverage from the existing walk all paths logic + the default validation. Maybe the easiest fix is to set CONTAINERS_CONF env as this one will skip all system configs. We loose coverage for this but it should not be a big deal as podman/buildah integrations tests can still catch issues

@rhatdan
Copy link
Member

rhatdan commented May 30, 2024

If we tested "/dev/null" we would get the default config

@renovate renovate bot force-pushed the renovate/major-ci-vm-image branch 14 times, most recently from 652897e to 5c512cc Compare June 6, 2024 13:09
@renovate renovate bot force-pushed the renovate/major-ci-vm-image branch 2 times, most recently from b80ebd0 to d378558 Compare June 7, 2024 09:28
@renovate renovate bot force-pushed the renovate/major-ci-vm-image branch from d378558 to ce76874 Compare June 7, 2024 21:10
Copy link
Member

@cevich cevich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...deleted...

Copy link
Contributor

openshift-ci bot commented Jun 10, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: cevich, renovate[bot]
Once this PR has been reviewed and has the lgtm label, please ask for approval from luap99. For more information see the Kubernetes Code Review Process.

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

@cevich
Copy link
Member

cevich commented Jun 10, 2024

ISTM like something might just need updating in the tests:


------------------------------
• [FAILED] [0.002 seconds]
Config 
ValidateConfig 
[It] should succeed with default config
/var/tmp/go/src/github.com/containers/common/pkg/config/config_test.go:21
[FAILED] Expected
      <string>: zstd:chunked
  to be equivalent to
      <string>: gzip
In 
[It]
 at: 
/var/tmp/go/src/github.com/containers/common/pkg/config/config_test.go:35
@ 06/07/24 16:19:53.26
------------------------------

@renovate renovate bot force-pushed the renovate/major-ci-vm-image branch 2 times, most recently from 6e3ee89 to be07cb8 Compare June 11, 2024 22:56
@cevich
Copy link
Member

cevich commented Jun 12, 2024

@vrothberg @Luap99 @rhatdan any hope of fixing the problem here? c/common is a pretty low-level dep. It would be nice to have it using the latest CI VM images everything else is already using.

@Luap99
Copy link
Member

Luap99 commented Jun 12, 2024

see comments above for how to fix.

In the short time we get a working f40 containers-common again, ref #2048,
so rebuilding newer images with the correct containers-common might be the fastest fix.
Or well just patch the config file in our CI setup here if you really want the new image merged.

@cevich
Copy link
Member

cevich commented Jun 12, 2024

so rebuilding newer images with the correct containers-common might be the fastest fix.

Oh, that I know how to do.

Or well just patch the config file in our CI setup here

I'm no expert, but skimming the comments above, it sounds like that might also be desirable?

@cevich cevich force-pushed the renovate/major-ci-vm-image branch from be07cb8 to de97d83 Compare June 12, 2024 18:08
@cevich
Copy link
Member

cevich commented Jun 12, 2024

Force-push: Jammed in a recent image set from containers/automation_images#354 (comment)

@renovate renovate bot force-pushed the renovate/major-ci-vm-image branch from de97d83 to 4a61f58 Compare June 12, 2024 18:22
@cevich
Copy link
Member

cevich commented Jun 12, 2024

Ugh, since renovate just overwrote my commit w/ newer images, they do indeed pass the F40 test.

@cevich
Copy link
Member

cevich commented Jun 13, 2024

...deleted: wrong tab...

@renovate renovate bot force-pushed the renovate/major-ci-vm-image branch 7 times, most recently from 9bd0ad5 to de69246 Compare June 19, 2024 09:44
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate renovate bot force-pushed the renovate/major-ci-vm-image branch from de69246 to 6ed7775 Compare June 21, 2024 08:40
@cevich cevich mentioned this pull request Jun 21, 2024
@cevich
Copy link
Member

cevich commented Jun 21, 2024

#2059 will fix this.

@renovate renovate bot deleted the renovate/major-ci-vm-image branch June 22, 2024 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants