[release-4.20] OCPBUGS-63171: Add imagestream update dryrun test

test/extended/images/dryrun.go

@@ -1,13 +1,16 @@
 package images
 
 import (
+	"context"
+	"time"
+
 	g "github.com/onsi/ginkgo/v2"
 	o "github.com/onsi/gomega"
 
+	"k8s.io/apimachinery/pkg/util/wait"
 	admissionapi "k8s.io/pod-security-admission/api"
 
 	exutil "github.com/openshift/origin/test/extended/util"
-	"github.com/openshift/origin/test/extended/util/image"
 )
 
 var _ = g.Describe("[sig-imageregistry] Image --dry-run", func() {
@@ -19,7 +22,7 @@ var _ = g.Describe("[sig-imageregistry] Image --dry-run", func() {
 
 	g.It("should not delete resources [apigroup:image.openshift.io]", func() {
 		g.By("preparing the image stream where the test image will be pushed")
-		err := oc.Run("tag").Args("--source=docker", image.ShellImage(), "test:latest").Execute()
+		err := oc.Run("tag").Args("openshift/cli:latest", "test:latest").Execute()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		err = exutil.WaitForAnImageStreamTag(oc, oc.Namespace(), "test", "latest")
@@ -41,4 +44,36 @@ var _ = g.Describe("[sig-imageregistry] Image --dry-run", func() {
 		_, err = oc.Run("get").Args("imagestream", "test", "-o", "jsonpath={.image.metadata.name}").Output()
 		o.Expect(err).NotTo(o.HaveOccurred())
 	})
+
+	g.It("should not update resources [apigroup:image.openshift.io]", func() {
+
+		g.By("actually creating imagestream for update dry-run test")
+		err := oc.Run("create").Args("imagestream", "dryrun-test").Execute()
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		defer func() {
+			g.By("cleaning up imagestream")
+			err := oc.Run("delete").Args("imagestream/dryrun-test", "--ignore-not-found=true").Execute()
+			o.Expect(err).NotTo(o.HaveOccurred())
+		}()
+
+		g.By("verifying the imagestream was actually created")
+		err = wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 30*time.Second, true, func(ctx context.Context) (bool, error) {
+			_, err := oc.Run("get").Args("imagestream", "dryrun-test", "-o", "jsonpath={.metadata.name}").Output()
+			if err != nil {
+				return false, nil // Continue polling
+			}
+			return true, nil // Success
+		})
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		g.By("triggering imagestream annotation update with --dry-run=server")
+		err = oc.Run("annotate").Args("imagestream/dryrun-test", "test-annotation=value1", "--dry-run=server").Execute()
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		g.By("verifying the annotation was not persisted")
+		output, err := oc.Run("get").Args("imagestream", "dryrun-test", "-o", "jsonpath={.metadata.annotations.test-annotation}").Output()
+		o.Expect(err).NotTo(o.HaveOccurred())
+		o.Expect(output).To(o.BeEmpty())
+	})
 })

test/extended/util/compat_otp/testdata/opm/render/validate/catalog-error/operator-2/index.json

@@ -1,8 +1,9 @@
+[
 {
     "schema": "olm.package",
     "name": "operator-2",
     "defaultChannel": "beta"
-}
+},
 {
     "schema": "olm.channel",
     "name": "4.7",
@@ -15,7 +16,7 @@
             ]
         }
     ]
-}
+},
 {
     "schema": "olm.channel",
     "name": "4.8",
@@ -30,7 +31,7 @@
             "replaces": "operator-2.v0.4.0"
         }
     ]
-}
+},
 {
     "schema": "olm.channel",
     "name": "4.9",
@@ -41,7 +42,7 @@
             "skipRange": ">=0.1.0 <0.6.0"
         }
     ]
-}
+},
 {
     "schema": "olm.channel",
     "name": "alpha",
@@ -55,7 +56,7 @@
             "replaces": "operator-2.v0.1.1"
         }
     ]
-}
+},
 {
     "schema": "olm.bundle",
     "name": "operator-2.v0.1.0",
@@ -78,7 +79,7 @@
             }
         }
     ]
-}
+},
 {
     "schema": "olm.bundle",
     "name": "operator-2.v0.2.0",
@@ -101,7 +102,7 @@
             }
         }
     ]
-}
+},
 {
     "schema": "olm.bundle",
     "name": "operator-2.v0.3.0",
@@ -124,7 +125,7 @@
             }
         }
     ]
-}
+},
 {
     "schema": "olm.bundle",
     "name": "operator-2.v0.4.0",
@@ -147,7 +148,7 @@
             }
         }
     ]
-}
+},
 {
     "schema": "olm.bundle",
     "name": "operator-2.v0.5.0",
@@ -170,7 +171,7 @@
             }
         }
     ]
-}
+},
 {
     "schema": "olm.bundle",
     "name": "operator-2.v0.6.0",
@@ -194,3 +195,4 @@
         }
     ]
 }
+]