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.

Sign up for GitHub

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

fix: correct e2e specs and CI check configuration #1023

Merged
merged 1 commit into from
Jul 18, 2023
Merged

fix: correct e2e specs and CI check configuration #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ teste2e-covdata: ## test e2e coverage
export GOCOVERDIR=$(CURDIR)/test/e2e/.cover; \
rm -rf $$GOCOVERDIR; \
mkdir -p $$GOCOVERDIR; \
$(MAKE) teste2e; \
$(GO_EXE) tool covdata textfmt -i=$$GOCOVERDIR -o "$(CURDIR)/test/e2e/coverage.txt"
$(MAKE) teste2e && $(GO_EXE) tool covdata textfmt -i=$$GOCOVERDIR -o "$(CURDIR)/test/e2e/coverage.txt"

.PHONY: help
help: ## Display this help
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suite/command/attach.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ var _ = Describe("OCI image layout users:", func() {
root := PrepareTempFiles()
subjectRef := LayoutRef(root, foobar.Tag)
prepare(root)
ORAS("attach", "--artifact-type", "test.attach", "-v", Flags.Layout, subjectRef, fmt.Sprintf("%s:%s", foobar.AttachFileName, foobar.AttachFileMedia)).
ORAS("attach", "--artifact-type", "test.attach", "-v", Flags.Layout, subjectRef, fmt.Sprintf("%s:%s", foobar.AttachFileName, foobar.AttachFileMedia), "--skip-delete-referrers").
MatchErrKeyWords("referrers deletion can only be enforced upon registry\n").
WithWorkDir(root).
Exec()
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suite/command/cp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ var _ = Describe("OCI layout users:", func() {
})

It("should copy and output verbosed warning for Feferrers deletion by default", func() {
ORAS("cp", RegistryRef(Host, ArtifactRepo, foobar.Tag), GinkgoT().TempDir(), Flags.ToLayout, "-v").
ORAS("cp", RegistryRef(Host, ArtifactRepo, foobar.Tag), GinkgoT().TempDir(), Flags.ToLayout, "-v", "--skip-delete-referrers").
MatchErrKeyWords("referrers deletion can only be enforced upon registry\n").
Exec()
})
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suite/command/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ var _ = Describe("OCI image layout users:", func() {
manifestPath := WriteTempFile("manifest.json", manifest)
root := filepath.Dir(manifestPath)
prepare(root)
ORAS("manifest", "push", root, Flags.Layout, manifestPath, "--skip-delete-referrers=false").
ORAS("manifest", "push", root, Flags.Layout, manifestPath, "--skip-delete-referrers").
WithWorkDir(root).
MatchErrKeyWords("referrers deletion can only be enforced upon registry\n").Exec()
})
Expand Down