fix: correct e2e specs and CI check configuration (#1023)

Signed-off-by: Billy Zha <[email protected]>
oras-project · Jul 18, 2023 · a1d0764 · a1d0764
1 parent 3092656
commit a1d0764
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -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

diff --git a/test/e2e/suite/command/attach.go b/test/e2e/suite/command/attach.go
@@ -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()

diff --git a/test/e2e/suite/command/cp.go b/test/e2e/suite/command/cp.go
@@ -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()
 		})

diff --git a/test/e2e/suite/command/manifest.go b/test/e2e/suite/command/manifest.go
@@ -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()
 		})