Skip to content

Conversation

@vvoland
Copy link
Collaborator

@vvoland vvoland commented Feb 23, 2023

- What I did

  • Updated notary server and alpine to versions with multi-platform images (previous ones were linux/amd64 only)
  • Skip tests which check linux/amd64 digests on non-linux/amd64 platforms (and add TODOs)

NOTE: This doesn't fix all failing tests (at least for me) on non amd64 platforms but at least makes the test-e2e start and run tests (it didn't even launch the tests before).

- How I did it

- How to verify it

make -f docker.Makefile E2E_ENGINE_VERSION=stable-dind  test-e2e

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@vvoland vvoland added area/testing kind/bugfix PR's that fix bugs labels Feb 23, 2023
@vvoland vvoland added this to the v-next milestone Feb 23, 2023
@codecov-commenter
Copy link

codecov-commenter commented Feb 23, 2023

Codecov Report

Merging #4045 (86a8c17) into master (dfb36ea) will decrease coverage by 0.30%.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4045      +/-   ##
==========================================
- Coverage   59.16%   58.86%   -0.30%     
==========================================
  Files         287      572     +285     
  Lines       24724    49572   +24848     
==========================================
+ Hits        14627    29182   +14555     
- Misses       9212    18624    +9412     
- Partials      885     1766     +881     

@maijuzi

This comment was marked as spam.

@vvoland
Copy link
Collaborator Author

vvoland commented Feb 24, 2023

Meh, test cases compare the output which contains a platform-specific manifest digest.
This will also not work under containerd image store (which outputs a manifest list digest, instead of platform-specific manifest).

@vvoland vvoland force-pushed the test-e2e-arm64-fixes branch from a725eeb to 86a8c17 Compare April 25, 2023 09:47
vvoland added 4 commits April 27, 2023 10:57
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This makes it possible to update the image loaded for e2e tests without
modifying all tests that use them.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
notary server version 0.5.0 is linux/amd64 only.
Also, e2e stage from top level Dockerfile uses 0.6.1 notary version -
change the Dockerfiles in e2e/testdata to have the same version.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Previous one was linux/amd64 only.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@vvoland vvoland force-pushed the test-e2e-arm64-fixes branch from 86a8c17 to eeaaf5d Compare April 27, 2023 08:58
@vvoland vvoland marked this pull request as ready for review April 27, 2023 09:09
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit 59b07b7 into docker:master Apr 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants