Revert 1.25 again

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.19-openshift-4.12
+  tag: rhel-8-release-golang-1.18-openshift-4.11

cmd/openshift-tests/images.go

@@ -54,19 +54,17 @@ func createImageMirrorForInternalImages(prefix string, ref reference.DockerImage
 
 	initialDefaults := k8simage.GetOriginalImageConfigs()
 	exceptions := image.Exceptions.List()
-	defaults := map[k8simage.ImageID]k8simage.Config{}
-
-imageLoop:
+	defaults := map[int]k8simage.Config{}
 	for i, config := range initialDefaults {
 		for _, exception := range exceptions {
 			if strings.Contains(config.GetE2EImage(), exception) {
-				continue imageLoop
+				continue
 			}
+			defaults[i] = config
 		}
-		defaults[i] = config
 	}
-
 	updated := k8simage.GetMappedImageConfigs(defaults, ref.Exact())
+
 	openshiftDefaults := image.OriginalImages()
 	openshiftUpdated := image.GetMappedImages(openshiftDefaults, defaultTestImageMirrorLocation)
 
@@ -166,15 +164,15 @@ func verifyImagesWithoutEnv() error {
 		}
 		existing, ok := defaults[index]
 		if !ok {
-			return fmt.Errorf("image %q not found in upstream images, must be moved to test/extended/util/image.  Upstream mappings are:\n%v", originalPullSpec, defaults)
+			return fmt.Errorf("image %q not found in upstream images, must be moved to test/extended/util/image", originalPullSpec)
 		}
 		if existing.GetE2EImage() != originalPullSpec {
-			return fmt.Errorf("image %q defines index %d but is defined upstream as %q, must be fixed in test/extended/util/image.  Upstream mappings are:\n%v", originalPullSpec, index, existing.GetE2EImage(), defaults)
+			return fmt.Errorf("image %q defines index %d but is defined upstream as %q, must be fixed in test/extended/util/image", originalPullSpec, index, existing.GetE2EImage())
 		}
 		mirror := image.LocationFor(originalPullSpec)
 		upstreamMirror := k8simage.GetE2EImage(index)
 		if mirror != upstreamMirror {
-			return fmt.Errorf("image %q defines index %d and mirror %q but is mirrored upstream as %q, must be fixed in test/extended/util/image.  Upstream mappings are:\n%v", originalPullSpec, index, mirror, upstreamMirror, defaults)
+			return fmt.Errorf("image %q defines index %d and mirror %q but is mirrored upstream as %q, must be fixed in test/extended/util/image", originalPullSpec, index, mirror, upstreamMirror)
 		}
 	}
 

cmd/openshift-tests/minimal.go

@@ -2659,7 +2659,7 @@ var (
 		"[sig-network-edge] OAuth remains available via cluster frontend ingress using reused connections":                                                                                                                                             {},
 		"[sig-cli] oc builds complex build start-build [Skipped:Disconnected] [Suite:openshift/conformance/parallel]":                                                                                                                                  {},
 		"[sig-network] IngressClass [Feature:Ingress] should set default value on new IngressClass [Serial] [Suite:openshift/conformance/serial] [Suite:k8s]":                                                                                          {},
-		"[sig-imageregistry][Serial] Image signature workflow can push a signed image to openshift registry and verify it [Suite:openshift/conformance/serial]":                                                                                        {},
+		"[sig-imageregistry][Serial][Suite:openshift/registry/serial] Image signature workflow can push a signed image to openshift registry and verify it [Suite:openshift/conformance/serial]":                                                       {},
 		"[sig-storage] In-tree Volumes [Driver: azure-disk] [Testpattern: Inline-volume (ext4)] volumes should allow exec of files on the volume [Suite:openshift/conformance/parallel] [Suite:k8s]":                                                   {},
 		"[sig-storage] In-tree Volumes [Driver: azure-disk] [Testpattern: Dynamic PV (default fs)] subPath should support file as subpath [LinuxOnly] [Suite:openshift/conformance/parallel] [Suite:k8s]":                                              {},
 		"[sig-storage] In-tree Volumes [Driver: azure-disk] [Testpattern: Dynamic PV (default fs)] subPath should be able to unmount after the subpath directory is deleted [LinuxOnly] [Suite:openshift/conformance/parallel] [Suite:k8s]":            {},

cmd/openshift-tests/openshift-tests.go

@@ -13,26 +13,28 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
+	"github.com/openshift/origin/pkg/monitor/monitor_cmd"
+	"github.com/openshift/origin/test/extended/util/disruption/externalservice"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
+
+	"github.com/onsi/ginkgo"
+	"github.com/openshift/library-go/pkg/image/reference"
+	"github.com/openshift/library-go/pkg/serviceability"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	utilflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
 	"k8s.io/klog/v2"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/openshift/library-go/pkg/image/reference"
-	"github.com/openshift/library-go/pkg/serviceability"
 	"github.com/openshift/origin/pkg/monitor"
-	"github.com/openshift/origin/pkg/monitor/monitor_cmd"
 	"github.com/openshift/origin/pkg/monitor/resourcewatch/cmd"
 	testginkgo "github.com/openshift/origin/pkg/test/ginkgo"
 	"github.com/openshift/origin/pkg/version"
 	exutil "github.com/openshift/origin/test/extended/util"
 	"github.com/openshift/origin/test/extended/util/cluster"
 	"github.com/openshift/origin/test/extended/util/disruption/controlplane"
-	"github.com/openshift/origin/test/extended/util/disruption/externalservice"
 	"github.com/openshift/origin/test/extended/util/disruption/frontends"
 )
 
@@ -407,7 +409,7 @@ func newRunTestCommand() *cobra.Command {
 		Use:   "run-test NAME",
 		Short: "Run a single test by name",
 		Long: templates.LongDesc(`
-		Execute a single test
+		Execute a single test 
 
 		This executes a single test by name. It is used by the run command during suite execution but may also
 		be used to test in isolation while developing new tests.
@@ -424,6 +426,10 @@ func newRunTestCommand() *cobra.Command {
 				return err
 			}
 
+			// Ignore the upstream suite behavior within test execution
+			ginkgo.GlobalSuite().ClearBeforeSuiteNode()
+			ginkgo.GlobalSuite().ClearAfterSuiteNode()
+
 			config, err := decodeProvider(os.Getenv("TEST_PROVIDER"), testOpt.DryRun, false, nil)
 			if err != nil {
 				return err

cmd/openshift-tests/provider.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
 
 	e2e "k8s.io/kubernetes/test/e2e/framework"