diff --git a/examples/quickstarts/rails-postgresql-persistent.json b/examples/quickstarts/rails-postgresql-persistent.json index f688a07612d6..c9ef073b8472 100644 --- a/examples/quickstarts/rails-postgresql-persistent.json +++ b/examples/quickstarts/rails-postgresql-persistent.json @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:3.1-ubi8", "namespace": "${NAMESPACE}" } }, diff --git a/examples/quickstarts/rails-postgresql.json b/examples/quickstarts/rails-postgresql.json index e7b7be7a454b..0178e7c940bf 100644 --- a/examples/quickstarts/rails-postgresql.json +++ b/examples/quickstarts/rails-postgresql.json @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:3.1-ubi8", "namespace": "${NAMESPACE}" } }, diff --git a/test/extended/builds/dockerfile.go b/test/extended/builds/dockerfile.go index 15eac13c0eea..a06c0c44dcff 100644 --- a/test/extended/builds/dockerfile.go +++ b/test/extended/builds/dockerfile.go @@ -26,7 +26,7 @@ FROM %s USER 1001 `, image.ShellImage()) testDockerfile2 = ` -FROM image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 +FROM image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 USER 1001 ` testDockerfile3 = ` @@ -110,7 +110,7 @@ USER 1001 o.Expect(image.Image.DockerImageMetadata.Object.(*docker10.DockerImage).Config.User).To(o.Equal("1001")) g.By("checking for the imported tag") - _, err = oc.ImageClient().ImageV1().ImageStreamTags(oc.Namespace()).Get(context.Background(), "ruby:3.0-ubi8", metav1.GetOptions{}) + _, err = oc.ImageClient().ImageV1().ImageStreamTags(oc.Namespace()).Get(context.Background(), "ruby:3.1-ubi8", metav1.GetOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) }) diff --git a/test/extended/cli/setimage.go b/test/extended/cli/setimage.go index 51ce4d1a1717..9402ca77f1a7 100644 --- a/test/extended/cli/setimage.go +++ b/test/extended/cli/setimage.go @@ -40,28 +40,28 @@ var _ = g.Describe("[sig-cli] oc set image", func() { g.By("waiting for created resources to be ready for testing") err = wait.PollImmediate(time.Second, 2*time.Minute, func() (bool, error) { - err := oc.Run("get").Args("imagestreamtags", "ruby:3.0-ubi8").Execute() + err := oc.Run("get").Args("imagestreamtags", "ruby:3.1-ubi8").Execute() return err == nil, nil }) o.Expect(err).NotTo(o.HaveOccurred()) g.By("testing --local flag validation") - out, err := oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.0-ubi8", "--local").Output() + out, err := oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.1-ubi8", "--local").Output() o.Expect(err).To(o.HaveOccurred()) o.Expect(out).To(o.ContainSubstring("you must specify resources by --filename when --local is set.")) g.By("testing --dry-run=client with -o flags") - out, err = oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.0-ubi8", "--source=istag", "--dry-run=client").Output() + out, err = oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.1-ubi8", "--source=istag", "--dry-run=client").Output() o.Expect(err).NotTo(o.HaveOccurred()) o.Expect(out).To(o.ContainSubstring("test-deployment-config")) o.Expect(out).To(o.ContainSubstring("deploymentconfig.apps.openshift.io/test-deployment-config image updated (dry run)")) - out, err = oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.0-ubi8", "--source=istag", "--dry-run=client", "-o", "name").Output() + out, err = oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.1-ubi8", "--source=istag", "--dry-run=client", "-o", "name").Output() o.Expect(err).NotTo(o.HaveOccurred()) o.Expect(out).To(o.ContainSubstring("deploymentconfig.apps.openshift.io/test-deployment-config")) g.By("testing basic image updates") - err = oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.0-ubi8", "--source=istag").Execute() + err = oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.1-ubi8", "--source=istag").Execute() o.Expect(err).NotTo(o.HaveOccurred()) out, err = oc.Run("get").Args("dc/test-deployment-config", "-o", "jsonpath='{.spec.template.spec.containers[0].image}'").Output() @@ -70,7 +70,7 @@ var _ = g.Describe("[sig-cli] oc set image", func() { o.Expect(out).To(o.ContainSubstring("/ruby@sha256:")) g.By("repeating basic image updates to ensure nothing changed") - err = oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.0-ubi8", "--source=istag").Execute() + err = oc.Run("set").Args("image", "dc/test-deployment-config", "ruby-helloworld=ruby:3.1-ubi8", "--source=istag").Execute() o.Expect(err).NotTo(o.HaveOccurred()) out, err = oc.Run("get").Args("dc/test-deployment-config", "-o", "jsonpath='{.spec.template.spec.containers[0].image}'").Output() @@ -110,7 +110,7 @@ var _ = g.Describe("[sig-cli] oc set image", func() { g.By("setting a different, valid image on multiple resources") err = wait.PollImmediate(time.Second, 2*time.Minute, func() (bool, error) { - err := oc.Run("set").Args("image", "pods,dc", "*=ruby:3.0-ubi8", "--all", "--source=imagestreamtag").Execute() + err := oc.Run("set").Args("image", "pods,dc", "*=ruby:3.1-ubi8", "--all", "--source=imagestreamtag").Execute() if err != nil { klog.Warningf("one of pods failed when setting image %v", err) return false, nil @@ -146,28 +146,28 @@ var _ = g.Describe("[sig-cli] oc set image", func() { g.By("waiting for created resources to be ready for testing") err = wait.PollImmediate(time.Second, 2*time.Minute, func() (bool, error) { - err := oc.Run("get").Args("imagestreamtags", "ruby:3.0-ubi8").Execute() + err := oc.Run("get").Args("imagestreamtags", "ruby:3.1-ubi8").Execute() return err == nil, nil }) o.Expect(err).NotTo(o.HaveOccurred()) g.By("testing --local flag validation") - out, err := oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.0-ubi8", "--local").Output() + out, err := oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.1-ubi8", "--local").Output() o.Expect(err).To(o.HaveOccurred()) o.Expect(out).To(o.ContainSubstring("you must specify resources by --filename when --local is set.")) g.By("testing --dry-run=client with -o flags") - out, err = oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.0-ubi8", "--source=istag", "--dry-run=client").Output() + out, err = oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.1-ubi8", "--source=istag", "--dry-run=client").Output() o.Expect(err).NotTo(o.HaveOccurred()) o.Expect(out).To(o.ContainSubstring("test-deployment")) o.Expect(out).To(o.ContainSubstring("deployment.apps/test-deployment image updated (dry run)")) - out, err = oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.0-ubi8", "--source=istag", "--dry-run=client", "-o", "name").Output() + out, err = oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.1-ubi8", "--source=istag", "--dry-run=client", "-o", "name").Output() o.Expect(err).NotTo(o.HaveOccurred()) o.Expect(out).To(o.ContainSubstring("deployment.apps/test-deployment")) g.By("testing basic image updates") - err = oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.0-ubi8", "--source=istag").Execute() + err = oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.1-ubi8", "--source=istag").Execute() o.Expect(err).NotTo(o.HaveOccurred()) out, err = oc.Run("get").Args("deployment/test-deployment", "-o", "jsonpath='{.spec.template.spec.containers[0].image}'").Output() @@ -176,7 +176,7 @@ var _ = g.Describe("[sig-cli] oc set image", func() { o.Expect(out).To(o.ContainSubstring("/ruby@sha256:")) g.By("repeating basic image updates to ensure nothing changed") - err = oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.0-ubi8", "--source=istag").Execute() + err = oc.Run("set").Args("image", "deployment/test-deployment", "ruby-helloworld=ruby:3.1-ubi8", "--source=istag").Execute() o.Expect(err).NotTo(o.HaveOccurred()) out, err = oc.Run("get").Args("deployment/test-deployment", "-o", "jsonpath='{.spec.template.spec.containers[0].image}'").Output() @@ -216,7 +216,7 @@ var _ = g.Describe("[sig-cli] oc set image", func() { g.By("setting a different, valid image on multiple resources") err = wait.PollImmediate(time.Second, 2*time.Minute, func() (bool, error) { - err := oc.Run("set").Args("image", "pods,deployments", "*=ruby:3.0-ubi8", "--all", "--source=imagestreamtag").Execute() + err := oc.Run("set").Args("image", "pods,deployments", "*=ruby:3.1-ubi8", "--all", "--source=imagestreamtag").Execute() if err != nil { klog.Warningf("one of pods failed when setting image %v", err) return false, nil diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 29cc42fa7f3c..436faf536658 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -11819,7 +11819,7 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:3.1-ubi8", "namespace": "${NAMESPACE}" } }, @@ -12446,7 +12446,7 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:3.1-ubi8", "namespace": "${NAMESPACE}" } }, @@ -17865,7 +17865,7 @@ var _testExtendedTestdataBuildsBuildSecretsTestS2iBuildJson = []byte(`{ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" }, "env": [ { @@ -19196,7 +19196,7 @@ spec: value: "2" from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 `) func testExtendedTestdataBuildsStatusfailBadcontextdirs2iYamlBytes() ([]byte, error) { @@ -19296,7 +19296,7 @@ spec: dockerStrategy: from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 `) func testExtendedTestdataBuildsStatusfailFetchimagecontentdockerYamlBytes() ([]byte, error) { @@ -19330,7 +19330,7 @@ spec: value: "2" from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 `) func testExtendedTestdataBuildsStatusfailFetchsourcedockerYamlBytes() ([]byte, error) { @@ -19364,7 +19364,7 @@ spec: value: "2" from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 `) func testExtendedTestdataBuildsStatusfailFetchsources2iYamlBytes() ([]byte, error) { @@ -19396,7 +19396,7 @@ spec: from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 scripts: "http://example.org/scripts" env: - name: http_proxy @@ -19439,7 +19439,7 @@ spec: value: "2" from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 forcePull: true `) @@ -20165,7 +20165,7 @@ items: dockerStrategy: from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 env: - name: SOME_HTTP_PROXY value: https://envuser:password@proxy3.com @@ -20354,7 +20354,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} status: lastVersion: 0 @@ -20383,7 +20383,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} status: lastVersion: 0 @@ -20411,7 +20411,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} status: lastVersion: 0 @@ -20440,7 +20440,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} status: lastVersion: 0 @@ -20468,7 +20468,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} nodeSelector: nodelabelkey: nodelabelvalue @@ -21260,7 +21260,7 @@ var _testExtendedTestdataBuildsTestEnvBuildJson = []byte(`{ ], "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" } } }, @@ -21609,7 +21609,7 @@ items: value: "2" from: kind: ImageStreamTag - name: ruby:3.0-ubi8 + name: ruby:3.1-ubi8 namespace: openshift - apiVersion: build.openshift.io/v1 kind: BuildConfig @@ -30053,7 +30053,7 @@ var _testExtendedTestdataClusterQuickstartsRailsPostgresqlJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:3.1-ubi8", "namespace": "${NAMESPACE}" } }, @@ -34169,9 +34169,10 @@ os::test::junit::declare_suite_end os::test::junit::declare_suite_start "cmd/images${IMAGES_TESTS_POSTFIX:-}/merge-tags-on-apply" os::cmd::expect_success 'oc new-project merge-tags' os::cmd::expect_success 'oc create -f ${TEST_DATA}/image-streams/image-streams-centos7.json' -os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.7-ubi8 3.0-ubi7 3.0-ubi8 3.0-ubi9 latest' +os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.7-ubi8 3.0-ubi7 3.0-ubi9 3.1-ubi8 latest' + os::cmd::expect_success 'oc apply -f ${TEST_DATA}/modified-ruby-imagestream.json' -os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.7-ubi8 3.0-ubi7 3.0-ubi8 3.0-ubi9 latest newtag' +os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.7-ubi8 3.0-ubi7 3.0-ubi9 3.1-ubi8 latest newtag' os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[0].annotations.version}' '2.7 patched' os::cmd::expect_success 'oc delete project merge-tags' echo "apply new imagestream tags: ok" @@ -37526,20 +37527,20 @@ var _testExtendedTestdataCmdTestCmdTestdataImageStreamsImageStreamsCentos7Json = } }, { - "name": "3.0-ubi8", + "name": "3.1-ubi8", "annotations": { - "description": "Build and run Ruby 3.0 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.", + "description": "Build and run Ruby 3.1 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.1/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Ruby 3.0 (UBI 8)", + "openshift.io/display-name": "Ruby 3.1 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/ruby-ex.git", - "supports": "ruby:3.0,ruby", + "supports": "ruby:3.1,ruby", "tags": "builder,ruby", - "version": "3.0" + "version": "3.1" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/ruby-30:latest" + "name": "registry.redhat.io/ubi8/ruby-31:latest" }, "generation": null, "importPolicy": {}, @@ -38297,12 +38298,12 @@ spec: tags: - from: kind: ImageStreamTag - name: "3.0" + name: "3.1" name: "latest" - from: kind: ImageStreamTag - name: ruby:3.0-ubi8 - name: "3.0" + name: ruby:3.1-ubi8 + name: "3.1" `) func testExtendedTestdataCmdTestCmdTestdataNewAppImagestreamRefYamlBytes() ([]byte, error) { @@ -45293,7 +45294,7 @@ var _testExtendedTestdataImageTestImageJson = []byte(`{ "name": "test", "creationTimestamp": null }, - "dockerImageReference": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8", + "dockerImageReference": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8", "dockerImageMetadata": { "kind": "DockerImage", "apiVersion": "1.0", @@ -48943,7 +48944,7 @@ var _testExtendedTestdataLong_namesFixtureJson = []byte(`{ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" } } } @@ -48972,7 +48973,7 @@ var _testExtendedTestdataLong_namesFixtureJson = []byte(`{ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" } } } @@ -51069,7 +51070,7 @@ var _testExtendedTestdataRun_policyParallelBcYaml = []byte(`--- sourceStrategy: from: kind: "DockerImage" - name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" resources: {} status: lastVersion: 0 @@ -51115,7 +51116,7 @@ var _testExtendedTestdataRun_policySerialBcYaml = []byte(`--- sourceStrategy: from: kind: "DockerImage" - name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" - kind: "BuildConfig" apiVersion: "build.openshift.io/v1" @@ -51136,7 +51137,7 @@ var _testExtendedTestdataRun_policySerialBcYaml = []byte(`--- sourceStrategy: from: kind: "DockerImage" - name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" `) func testExtendedTestdataRun_policySerialBcYamlBytes() ([]byte, error) { @@ -51179,7 +51180,7 @@ var _testExtendedTestdataRun_policySerialLatestOnlyBcYaml = []byte(`--- sourceStrategy: from: kind: "DockerImage" - name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" resources: {} status: lastVersion: 0 diff --git a/test/extended/testdata/builds/build-secrets/test-s2i-build.json b/test/extended/testdata/builds/build-secrets/test-s2i-build.json index 11024b650563..111c8bbf5254 100644 --- a/test/extended/testdata/builds/build-secrets/test-s2i-build.json +++ b/test/extended/testdata/builds/build-secrets/test-s2i-build.json @@ -45,7 +45,7 @@ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" }, "env": [ { diff --git a/test/extended/testdata/builds/statusfail-badcontextdirs2i.yaml b/test/extended/testdata/builds/statusfail-badcontextdirs2i.yaml index c85801bf777c..f692560c1e7d 100644 --- a/test/extended/testdata/builds/statusfail-badcontextdirs2i.yaml +++ b/test/extended/testdata/builds/statusfail-badcontextdirs2i.yaml @@ -15,4 +15,4 @@ spec: value: "2" from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 diff --git a/test/extended/testdata/builds/statusfail-fetchimagecontentdocker.yaml b/test/extended/testdata/builds/statusfail-fetchimagecontentdocker.yaml index 2dcd153431bf..d81cca16e305 100644 --- a/test/extended/testdata/builds/statusfail-fetchimagecontentdocker.yaml +++ b/test/extended/testdata/builds/statusfail-fetchimagecontentdocker.yaml @@ -19,4 +19,4 @@ spec: dockerStrategy: from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 diff --git a/test/extended/testdata/builds/statusfail-fetchsourcedocker.yaml b/test/extended/testdata/builds/statusfail-fetchsourcedocker.yaml index 479ba9d5eb37..b3e32d7dfffb 100644 --- a/test/extended/testdata/builds/statusfail-fetchsourcedocker.yaml +++ b/test/extended/testdata/builds/statusfail-fetchsourcedocker.yaml @@ -14,4 +14,4 @@ spec: value: "2" from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 diff --git a/test/extended/testdata/builds/statusfail-fetchsources2i.yaml b/test/extended/testdata/builds/statusfail-fetchsources2i.yaml index 79f712074150..984f65b40211 100644 --- a/test/extended/testdata/builds/statusfail-fetchsources2i.yaml +++ b/test/extended/testdata/builds/statusfail-fetchsources2i.yaml @@ -14,4 +14,4 @@ spec: value: "2" from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 diff --git a/test/extended/testdata/builds/statusfail-genericreason.yaml b/test/extended/testdata/builds/statusfail-genericreason.yaml index 8a074a89e694..54d05bd51b02 100644 --- a/test/extended/testdata/builds/statusfail-genericreason.yaml +++ b/test/extended/testdata/builds/statusfail-genericreason.yaml @@ -12,7 +12,7 @@ spec: from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 scripts: "http://example.org/scripts" env: - name: http_proxy diff --git a/test/extended/testdata/builds/statusfail-oomkilled.yaml b/test/extended/testdata/builds/statusfail-oomkilled.yaml index 7fcd8aaed3a9..8a72b901db66 100644 --- a/test/extended/testdata/builds/statusfail-oomkilled.yaml +++ b/test/extended/testdata/builds/statusfail-oomkilled.yaml @@ -17,5 +17,5 @@ spec: value: "2" from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 forcePull: true diff --git a/test/extended/testdata/builds/test-build-proxy.yaml b/test/extended/testdata/builds/test-build-proxy.yaml index 6c5d1c456e94..e40b46b089d1 100644 --- a/test/extended/testdata/builds/test-build-proxy.yaml +++ b/test/extended/testdata/builds/test-build-proxy.yaml @@ -88,7 +88,7 @@ items: dockerStrategy: from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 env: - name: SOME_HTTP_PROXY value: https://envuser:password@proxy3.com diff --git a/test/extended/testdata/builds/test-build.yaml b/test/extended/testdata/builds/test-build.yaml index 8805efa5236c..6041fac7062b 100644 --- a/test/extended/testdata/builds/test-build.yaml +++ b/test/extended/testdata/builds/test-build.yaml @@ -48,7 +48,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} status: lastVersion: 0 @@ -77,7 +77,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} status: lastVersion: 0 @@ -105,7 +105,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} status: lastVersion: 0 @@ -134,7 +134,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} status: lastVersion: 0 @@ -162,7 +162,7 @@ items: value: '5' from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8 + name: image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8 resources: {} nodeSelector: nodelabelkey: nodelabelvalue diff --git a/test/extended/testdata/builds/test-env-build.json b/test/extended/testdata/builds/test-env-build.json index 52f01ce262d7..be1cf7b403dc 100644 --- a/test/extended/testdata/builds/test-env-build.json +++ b/test/extended/testdata/builds/test-env-build.json @@ -23,7 +23,7 @@ ], "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" } } }, diff --git a/test/extended/testdata/builds/test-imagesource-buildconfig.yaml b/test/extended/testdata/builds/test-imagesource-buildconfig.yaml index f9fbdb0e789a..506ece56705f 100644 --- a/test/extended/testdata/builds/test-imagesource-buildconfig.yaml +++ b/test/extended/testdata/builds/test-imagesource-buildconfig.yaml @@ -26,7 +26,7 @@ items: value: "2" from: kind: ImageStreamTag - name: ruby:3.0-ubi8 + name: ruby:3.1-ubi8 namespace: openshift - apiVersion: build.openshift.io/v1 kind: BuildConfig diff --git a/test/extended/testdata/cluster/quickstarts/rails-postgresql.json b/test/extended/testdata/cluster/quickstarts/rails-postgresql.json index e7b7be7a454b..0178e7c940bf 100644 --- a/test/extended/testdata/cluster/quickstarts/rails-postgresql.json +++ b/test/extended/testdata/cluster/quickstarts/rails-postgresql.json @@ -117,7 +117,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:3.0-ubi8", + "name": "ruby:3.1-ubi8", "namespace": "${NAMESPACE}" } }, diff --git a/test/extended/testdata/cmd/test/cmd/images.sh b/test/extended/testdata/cmd/test/cmd/images.sh index a6796517e03d..4765fae98b64 100755 --- a/test/extended/testdata/cmd/test/cmd/images.sh +++ b/test/extended/testdata/cmd/test/cmd/images.sh @@ -304,9 +304,10 @@ os::test::junit::declare_suite_end os::test::junit::declare_suite_start "cmd/images${IMAGES_TESTS_POSTFIX:-}/merge-tags-on-apply" os::cmd::expect_success 'oc new-project merge-tags' os::cmd::expect_success 'oc create -f ${TEST_DATA}/image-streams/image-streams-centos7.json' -os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.7-ubi8 3.0-ubi7 3.0-ubi8 3.0-ubi9 latest' +os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.7-ubi8 3.0-ubi7 3.0-ubi9 3.1-ubi8 latest' + os::cmd::expect_success 'oc apply -f ${TEST_DATA}/modified-ruby-imagestream.json' -os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.7-ubi8 3.0-ubi7 3.0-ubi8 3.0-ubi9 latest newtag' +os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[*].name}' '2.7-ubi8 3.0-ubi7 3.0-ubi9 3.1-ubi8 latest newtag' os::cmd::expect_success_and_text 'oc get is ruby -o jsonpath={.spec.tags[0].annotations.version}' '2.7 patched' os::cmd::expect_success 'oc delete project merge-tags' echo "apply new imagestream tags: ok" diff --git a/test/extended/testdata/cmd/test/cmd/testdata/image-streams/image-streams-centos7.json b/test/extended/testdata/cmd/test/cmd/testdata/image-streams/image-streams-centos7.json index 2c3ea827fe69..6175c7fb2b17 100644 --- a/test/extended/testdata/cmd/test/cmd/testdata/image-streams/image-streams-centos7.json +++ b/test/extended/testdata/cmd/test/cmd/testdata/image-streams/image-streams-centos7.json @@ -843,20 +843,20 @@ } }, { - "name": "3.0-ubi8", + "name": "3.1-ubi8", "annotations": { - "description": "Build and run Ruby 3.0 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.", + "description": "Build and run Ruby 3.1 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.1/README.md.", "iconClass": "icon-ruby", - "openshift.io/display-name": "Ruby 3.0 (UBI 8)", + "openshift.io/display-name": "Ruby 3.1 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/ruby-ex.git", - "supports": "ruby:3.0,ruby", + "supports": "ruby:3.1,ruby", "tags": "builder,ruby", - "version": "3.0" + "version": "3.1" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/ruby-30:latest" + "name": "registry.redhat.io/ubi8/ruby-31:latest" }, "generation": null, "importPolicy": {}, diff --git a/test/extended/testdata/cmd/test/cmd/testdata/new-app/imagestream-ref.yaml b/test/extended/testdata/cmd/test/cmd/testdata/new-app/imagestream-ref.yaml index e10881dc42b9..e62087b3baf2 100644 --- a/test/extended/testdata/cmd/test/cmd/testdata/new-app/imagestream-ref.yaml +++ b/test/extended/testdata/cmd/test/cmd/testdata/new-app/imagestream-ref.yaml @@ -6,9 +6,9 @@ spec: tags: - from: kind: ImageStreamTag - name: "3.0" + name: "3.1" name: "latest" - from: kind: ImageStreamTag - name: ruby:3.0-ubi8 - name: "3.0" + name: ruby:3.1-ubi8 + name: "3.1" diff --git a/test/extended/testdata/image/test-image.json b/test/extended/testdata/image/test-image.json index acee7d39bcfc..74e20efb098e 100644 --- a/test/extended/testdata/image/test-image.json +++ b/test/extended/testdata/image/test-image.json @@ -5,7 +5,7 @@ "name": "test", "creationTimestamp": null }, - "dockerImageReference": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8", + "dockerImageReference": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8", "dockerImageMetadata": { "kind": "DockerImage", "apiVersion": "1.0", diff --git a/test/extended/testdata/long_names/fixture.json b/test/extended/testdata/long_names/fixture.json index e0546dc0d513..340dd1d6b1c8 100644 --- a/test/extended/testdata/long_names/fixture.json +++ b/test/extended/testdata/long_names/fixture.json @@ -26,7 +26,7 @@ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" } } } @@ -55,7 +55,7 @@ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + "name": "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" } } } diff --git a/test/extended/testdata/run_policy/parallel-bc.yaml b/test/extended/testdata/run_policy/parallel-bc.yaml index 50cb28f2b1a6..aca472764c02 100644 --- a/test/extended/testdata/run_policy/parallel-bc.yaml +++ b/test/extended/testdata/run_policy/parallel-bc.yaml @@ -32,7 +32,7 @@ sourceStrategy: from: kind: "DockerImage" - name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" resources: {} status: lastVersion: 0 diff --git a/test/extended/testdata/run_policy/serial-bc.yaml b/test/extended/testdata/run_policy/serial-bc.yaml index 43eabadc4b1b..7c64093b2057 100644 --- a/test/extended/testdata/run_policy/serial-bc.yaml +++ b/test/extended/testdata/run_policy/serial-bc.yaml @@ -23,7 +23,7 @@ sourceStrategy: from: kind: "DockerImage" - name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" - kind: "BuildConfig" apiVersion: "build.openshift.io/v1" @@ -44,4 +44,4 @@ sourceStrategy: from: kind: "DockerImage" - name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" diff --git a/test/extended/testdata/run_policy/serial-latest-only-bc.yaml b/test/extended/testdata/run_policy/serial-latest-only-bc.yaml index 2bcc0f1ba0e7..c62c66e6875d 100644 --- a/test/extended/testdata/run_policy/serial-latest-only-bc.yaml +++ b/test/extended/testdata/run_policy/serial-latest-only-bc.yaml @@ -23,7 +23,7 @@ sourceStrategy: from: kind: "DockerImage" - name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8" + name: "image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8" resources: {} status: lastVersion: 0