Skip to content

Update Push integration tests and remove --user flag#1868

Merged
Shubhranshu153 merged 1 commit into
awslabs:mainfrom
prafgup:fix-push-user-flag
Feb 20, 2026
Merged

Update Push integration tests and remove --user flag#1868
Shubhranshu153 merged 1 commit into
awslabs:mainfrom
prafgup:fix-push-user-flag

Conversation

@prafgup
Copy link
Copy Markdown
Contributor

@prafgup prafgup commented Feb 19, 2026

Issue #, if available:
Followups from - #1866

Description of changes:
Removed --user from Push Integration test and changed image to alpine as per discussion here - https://github.com/awslabs/soci-snapshotter/pull/1866/changes#r2824641126

Testing performed:
Ran integration tests -

sudo GO_TEST_FLAGS="-run TestSociArtifactsPushAndPull  -count=1" make integration
cd cmd/ ; GO111MODULE=auto go build -o /Volumes/git/prafulg/soci-snapshotter/out/soci-snapshotter-grpc  -ldflags '-X github.com/awslabs/soci-snapshotter/version.Version=18083c98.m -X github.com/awslabs/soci-snapshotter/version.Revision=18083c989ba30fd33781cc1dddac651a63151ac1.m  -s -w '  ./soci-snapshotter-grpc
cd cmd/ ; GO111MODULE=auto go build -o /Volumes/git/prafulg/soci-snapshotter/out/soci  -ldflags '-X github.com/awslabs/soci-snapshotter/version.Version=18083c98.m -X github.com/awslabs/soci-snapshotter/version.Revision=18083c989ba30fd33781cc1dddac651a63151ac1.m  -s -w '  ./soci
integration
SOCI_SNAPSHOTTER_PROJECT_ROOT=/Volumes/git/prafulg/soci-snapshotter
=== RUN   TestSociArtifactsPushAndPull
=== RUN   TestSociArtifactsPushAndPull/amd64
=== RUN   TestSociArtifactsPushAndPull/arm64
--- PASS: TestSociArtifactsPushAndPull (12.35s)
    --- PASS: TestSociArtifactsPushAndPull/amd64 (5.63s)
    --- PASS: TestSociArtifactsPushAndPull/arm64 (5.58s)
PASS
ok      github.com/awslabs/soci-snapshotter/integration 127.211s

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@prafgup prafgup requested a review from a team as a code owner February 19, 2026 00:51
@github-actions github-actions Bot added go Pull requests that update Go code testing Unit and/or integration tests labels Feb 19, 2026
@prafgup prafgup changed the title Update Push integration tests and Stabilize flakey nerdctl pulls Update Push integration tests and Stabilize flaky nerdctl pulls Feb 19, 2026
@prafgup
Copy link
Copy Markdown
Contributor Author

prafgup commented Feb 19, 2026

@sondavidb 😄
Followups from - #1866

@sondavidb
Copy link
Copy Markdown
Contributor

Thanks for this!

I took a look at the last few failures in our actions (1, 2, 3, 4, 5) and I don't think the failures are concentrated solely in the functions changed here.

I think there's a better mechanism we can use here to catch these retries as opposed to changing every single pull to a retry (e.g. rerunning only the tests that failed). I'm happy to just make the image changes and removing the --user flag usage.

@prafgup
Copy link
Copy Markdown
Contributor Author

prafgup commented Feb 19, 2026

Ah, you are right, I see we use imagePullCmd at a lot of places where few of the failures were seen.

I see nerdctl pull does not have any inbuilt retry - https://github.com/containerd/nerdctl/blob/main/docs/command-reference.md#whale-nerdctl-pull

I think with our current setup we might have to change imagePullCmd to something like this to have retries -

imagePullCmd = []string{"sh", "-c", `
for i in 1 2 3; do
  nerdctl pull -q --snapshotter soci "$@" && exit 0
  sleep 5
done
exit 1
`, "--"}

and the usage remains the same as-is - sh.X(append(imagePullCmd, "--soci-index-digest", indexDigest, imgInfo.ref)...)

For now I would just change the PR to only have Image change and --user flag removal 😄

Signed-off-by: Praful Gupta <prafulgupta6@gmail.com>
@prafgup prafgup changed the title Update Push integration tests and Stabilize flaky nerdctl pulls Update Push integration tests and remove --user flag Feb 19, 2026
@prafgup
Copy link
Copy Markdown
Contributor Author

prafgup commented Feb 20, 2026

@Shubhranshu153 flaky test failure again in one of the the checks due to networking, can you please re-run that?

@Swapnanil-Gupta
Copy link
Copy Markdown
Contributor

Thanks! LGTM.

@Shubhranshu153 Shubhranshu153 merged commit b4baddb into awslabs:main Feb 20, 2026
70 of 72 checks passed
@prafgup prafgup deleted the fix-push-user-flag branch February 20, 2026 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

go Pull requests that update Go code testing Unit and/or integration tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants