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

Remove Docker incompat from image prune and build tests #3330

Merged

Conversation

austinvazquez
Copy link
Contributor

Description

This change is a followup to #3319 to enable image prune filter until integration tests on Docker.

SOURCE_DATE_EPOCH is available in buildx since v0.10 which should be available in Docker 23 and greater.

Testing

  • Enables TestImagePruneFilterUntil on Docker
  • Enables TestBuildSourceDateEpoch on Docker

@austinvazquez austinvazquez marked this pull request as ready for review August 18, 2024 18:28
@apostasie
Copy link
Contributor

+1

base := testutil.NewBase(t)
base.Env = append(base.Env, fmt.Sprintf("SOURCE_DATE_EPOCH=%d", time.Now().Add(-2*time.Hour).Unix()))
Copy link
Member

Choose a reason for hiding this comment

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

Needs a comment line to explain this

@austinvazquez austinvazquez force-pushed the remove-docker-incompat-from-tests branch 3 times, most recently from cc9b0f3 to e5aab95 Compare August 20, 2024 01:56
@austinvazquez
Copy link
Contributor Author

I was hoping we could remove the sleep and deterministically test with the SOURCE_DATE_EPOCH; however, through testing it appears images built with containerd v1.6 are not respecting the SOURCE_DATE_EPOCH.

@apostasie
Copy link
Contributor

apostasie commented Aug 20, 2024

Looks like 1.6 will be supported until at least Feb 2025... https://containerd.io/releases/

I am not sure it is worth the effort, but we could specialize this test for different versions of containerd? (RequireDaemonVersion?)

@AkihiroSuda AkihiroSuda added this to the v2.0.0 milestone Aug 20, 2024
@austinvazquez austinvazquez force-pushed the remove-docker-incompat-from-tests branch from e5aab95 to 6362afc Compare August 22, 2024 19:51
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 1839927 into containerd:main Aug 23, 2024
22 checks passed
@austinvazquez austinvazquez deleted the remove-docker-incompat-from-tests branch August 24, 2024 06:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants