fix: exclude OLM index.json from JSON validation and update generated annotations

wangke19 · wangke19 · commit aaef791f871a · 2025-10-16T16:27:55.000+08:00
- Add test/extended/util/compat_otp/testdata/opm/render/validate/catalog-error/operator-2/index.json to excluded files list in verify-jsonformat.sh
- Update generated annotations file with new test annotation for Image --dry-run should not update resources
diff --git a/hack/verify-jsonformat.sh b/hack/verify-jsonformat.sh
@@ -20,6 +20,7 @@ found=0
 excluded_files=(
   "test/extended/testdata/cmd/test/cmd/testdata/new-app/bc-from-imagestreamimage.json"
   "test/extended/testdata/cmd/test/cmd/testdata/new-app/invalid.json"
+  "test/extended/util/compat_otp/testdata/opm/render/validate/catalog-error/operator-2/index.json"
 )
 
 set +e
diff --git a/test/extended/images/dryrun.go b/test/extended/images/dryrun.go
@@ -7,8 +7,8 @@ import (
 	g "github.com/onsi/ginkgo/v2"
 	o "github.com/onsi/gomega"
 
-	admissionapi "k8s.io/pod-security-admission/api"
 	"k8s.io/apimachinery/pkg/util/wait"
+	admissionapi "k8s.io/pod-security-admission/api"
 
 	exutil "github.com/openshift/origin/test/extended/util"
 )
diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ found=0`
`20`	`20`	`excluded_files=(`
`21`	`21`	`"test/extended/testdata/cmd/test/cmd/testdata/new-app/bc-from-imagestreamimage.json"`
`22`	`22`	`"test/extended/testdata/cmd/test/cmd/testdata/new-app/invalid.json"`
	`23`	`+ "test/extended/util/compat_otp/testdata/opm/render/validate/catalog-error/operator-2/index.json"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`set +e`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`g "github.com/onsi/ginkgo/v2"`
`8`	`8`	`o "github.com/onsi/gomega"`
`9`	`9`
`10`		`- admissionapi "k8s.io/pod-security-admission/api"`
`11`	`10`	`"k8s.io/apimachinery/pkg/util/wait"`
	`11`	`+ admissionapi "k8s.io/pod-security-admission/api"`
`12`	`12`
`13`	`13`	`exutil "github.com/openshift/origin/test/extended/util"`
`14`	`14`	`)`