diff --git a/examples/image-streams/image-streams-centos7.json b/examples/image-streams/image-streams-centos7.json index edd6ac1a379a..e46da78b11ac 100644 --- a/examples/image-streams/image-streams-centos7.json +++ b/examples/image-streams/image-streams-centos7.json @@ -20,18 +20,18 @@ { "name": "latest", "annotations": { - "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", + "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/9.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", "iconClass": "icon-dotnet", "openshift.io/display-name": ".NET (Latest)", "sampleContextDir": "app", - "sampleRef": "dotnet-6.0", + "sampleRef": "dotnet-9.0", "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", "supports": "dotnet", "tags": "builder,.net,dotnet,dotnetcore,hidden" }, "from": { "kind": "ImageStreamTag", - "name": "6.0-ubi8" + "name": "9.0-ubi8" }, "generation": null, "importPolicy": {}, @@ -85,6 +85,52 @@ "type": "Local" } }, + { + "name": "9.0-ubi8", + "annotations": { + "description": "Build and run .NET 9 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/9.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 9 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnet-9.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:9.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet90", + "version": "9.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-90:9.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "9.0", + "annotations": { + "description": "Build and run .NET 9 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/9.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 9 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnetcore-9.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:9.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet90,hidden", + "version": "9.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-90:9.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "3.1-ubi8", "annotations": { diff --git a/examples/quickstarts/django-postgresql-persistent.json b/examples/quickstarts/django-postgresql-persistent.json index 28f2aa2ac694..0eae4612f7e4 100644 --- a/examples/quickstarts/django-postgresql-persistent.json +++ b/examples/quickstarts/django-postgresql-persistent.json @@ -484,7 +484,8 @@ { "name": "SOURCE_REPOSITORY_REF", "displayName": "Git Reference", - "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch." + "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.", + "value": "4.2.x" }, { "name": "CONTEXT_DIR", diff --git a/examples/quickstarts/django-postgresql.json b/examples/quickstarts/django-postgresql.json index 6359561b6457..c9fd34a81bfd 100644 --- a/examples/quickstarts/django-postgresql.json +++ b/examples/quickstarts/django-postgresql.json @@ -458,7 +458,8 @@ { "name": "SOURCE_REPOSITORY_REF", "displayName": "Git Reference", - "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch." + "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.", + "value": "4.2.x" }, { "name": "CONTEXT_DIR", diff --git a/test/extended/image_ecosystem/s2i_images.go b/test/extended/image_ecosystem/s2i_images.go index 02e318acbece..e5367fb846ef 100644 --- a/test/extended/image_ecosystem/s2i_images.go +++ b/test/extended/image_ecosystem/s2i_images.go @@ -252,17 +252,17 @@ var s2iImages = map[string][]tc{ }, "dotnet": { { - Version: "60", + Version: "90", Cmd: "dotnet --version", - Expected: "6.0", - Tag: "6.0-ubi8", + Expected: "9.0", + Tag: "9.0-ubi8", Arches: []string{"amd64", "arm64", "s390x"}, }, // { - // Version: "80", + // Version: "100", // Cmd: "dotnet --version", - // Expected: "8.0", - // Tag: "8.0-ubi8", + // Expected: "10.0", + // Tag: "10.0-ubi8", // Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, // }, }, diff --git a/test/extended/image_ecosystem/scl.go b/test/extended/image_ecosystem/scl.go index a3ec91e98cc2..e4cb6ec4192e 100644 --- a/test/extended/image_ecosystem/scl.go +++ b/test/extended/image_ecosystem/scl.go @@ -55,10 +55,20 @@ func defineTest(name string, t tc, oc *exutil.CLI) { } e2e.Logf("%s:%s passed architecture compatibility", name, t.Tag) g.By(fmt.Sprintf("creating a sample pod for %q", t.DockerImageReference)) - pod := exutil.GetPodForContainer(kapiv1.Container{ + container := kapiv1.Container{ Name: "test", Image: t.DockerImageReference, - }) + } + + // For .NET 9.0, explicitly run the usage script to work around Terminal Logger issues + // See: https://developers.redhat.com/articles/2024/11/15/net-9-now-available-rhel-and-openshift + if name == "dotnet" && strings.Contains(t.Tag, "9.0") { + e2e.Logf("Setting explicit command for .NET 9.0 to run usage script") + container.Command = []string{"/usr/libexec/s2i/usage"} + } + + pod := exutil.GetPodForContainer(container) + _, err := oc.KubeClient().CoreV1().Pods(oc.Namespace()).Create(context.Background(), pod, metav1.CreateOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 4a0d8860cf3e..26a06ec3335f 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -2848,18 +2848,18 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ { "name": "latest", "annotations": { - "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/6.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", + "description": "Build and run .NET applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/9.0/build/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET available on OpenShift, including major versions updates.", "iconClass": "icon-dotnet", "openshift.io/display-name": ".NET (Latest)", "sampleContextDir": "app", - "sampleRef": "dotnet-6.0", + "sampleRef": "dotnet-9.0", "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", "supports": "dotnet", "tags": "builder,.net,dotnet,dotnetcore,hidden" }, "from": { "kind": "ImageStreamTag", - "name": "6.0-ubi8" + "name": "9.0-ubi8" }, "generation": null, "importPolicy": {}, @@ -2913,6 +2913,52 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ "type": "Local" } }, + { + "name": "9.0-ubi8", + "annotations": { + "description": "Build and run .NET 9 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/9.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 9 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnet-9.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:9.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet90", + "version": "9.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-90:9.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "9.0", + "annotations": { + "description": "Build and run .NET 9 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/9.0/build/README.md.", + "iconClass": "icon-dotnet", + "openshift.io/display-name": ".NET 9 (UBI 8)", + "sampleContextDir": "app", + "sampleRef": "dotnetcore-9.0", + "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore-ex", + "supports": "dotnet:9.0,dotnet", + "tags": "builder,.net,dotnet,dotnetcore,dotnet90,hidden", + "version": "9.0" + }, + "from": { + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi8/dotnet-90:9.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "Local" + } + }, { "name": "3.1-ubi8", "annotations": { @@ -9284,7 +9330,8 @@ var _examplesQuickstartsDjangoPostgresqlPersistentJson = []byte(`{ { "name": "SOURCE_REPOSITORY_REF", "displayName": "Git Reference", - "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch." + "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.", + "value": "4.2.x" }, { "name": "CONTEXT_DIR", @@ -9833,7 +9880,8 @@ var _examplesQuickstartsDjangoPostgresqlJson = []byte(`{ { "name": "SOURCE_REPOSITORY_REF", "displayName": "Git Reference", - "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch." + "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.", + "value": "4.2.x" }, { "name": "CONTEXT_DIR", @@ -28908,7 +28956,8 @@ var _testExtendedTestdataClusterQuickstartsDjangoPostgresqlJson = []byte(`{ { "name": "SOURCE_REPOSITORY_REF", "displayName": "Git Reference", - "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch." + "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.", + "value": "4.2.x" }, { "name": "CONTEXT_DIR", diff --git a/test/extended/testdata/cluster/quickstarts/django-postgresql.json b/test/extended/testdata/cluster/quickstarts/django-postgresql.json index 6359561b6457..c9fd34a81bfd 100644 --- a/test/extended/testdata/cluster/quickstarts/django-postgresql.json +++ b/test/extended/testdata/cluster/quickstarts/django-postgresql.json @@ -458,7 +458,8 @@ { "name": "SOURCE_REPOSITORY_REF", "displayName": "Git Reference", - "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch." + "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch.", + "value": "4.2.x" }, { "name": "CONTEXT_DIR",