Skip to content

OCPBUGS-42237: bump ruby-3.0-ubi8 image to ruby-3.1-ubi8 #29134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Oct 4, 2024
Merged

OCPBUGS-42237: bump ruby-3.0-ubi8 image to ruby-3.1-ubi8 #29134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/quickstarts/rails-postgresql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "ruby:3.0-ubi8",
"name": "ruby:3.1-ubi8",
"namespace": "${NAMESPACE}"
}
},
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstarts/rails-postgresql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "ruby:3.0-ubi8",
"name": "ruby:3.1-ubi8",
"namespace": "${NAMESPACE}"
}
},
Expand Down
4 changes: 2 additions & 2 deletions test/extended/builds/dockerfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down Expand Up @@ -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())
})

Expand Down
28 changes: 14 additions & 14 deletions test/extended/cli/setimage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand Down Expand Up @@ -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
Expand Down
Loading