Skip to content

Migrate tests away from using samples-operator provided imagestreams #26913

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-robot merged 1 commit into from
Apr 1, 2022
Merged

Migrate tests away from using samples-operator provided imagestreams #26913

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
11 changes: 11 additions & 0 deletions test/extended/deployments/deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,13 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun

g.It("should run a successful deployment with multiple triggers", func() {
g.By("creating DC")

_, err := oc.Run("import-image").Args("registry.redhat.io/ubi8/ruby-30:latest", "--confirm", "--reference-policy=local").Output()
Copy link
Contributor

@dmage dmage Mar 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we use only images that are mirrored? https://github.com/openshift/origin/blob/master/test/extended/util/image/README.md

Copy link
Contributor Author

@bparees bparees Mar 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm trying to determine the answer to that here:

#26912

because many of these tests already weren't using images that were mirrored (this one, for example, was just using the ruby imagestream provided by the samples operator and hosted on registry.redhat.io already).

so this was the minimal change to get away from using that imagestream while still using the same underlying image.

since i'm not confident we should be mirroring images like this (redhat product images), i'm hoping we are allowed use direct references for non-conformance tests.

Copy link
Contributor Author

@bparees bparees Mar 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dmage #26912 has clarified that only conformance tests need their images mirrored, these are not conformance tests.

o.Expect(err).NotTo(o.HaveOccurred())

_, err = oc.Run("import-image").Args("registry.redhat.io/rhel8/postgresql-13:latest", "--confirm", "--reference-policy=local").Output()
o.Expect(err).NotTo(o.HaveOccurred())

dc, err := createDeploymentConfig(oc, multipleICTFixture)
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(dc.Name).To(o.Equal(dcName))
Expand All @@ -553,6 +560,10 @@ var _ = g.Describe("[sig-apps][Feature:DeploymentConfig] deploymentconfigs", fun
})

g.It("should run a successful deployment with a trigger used by different containers", func() {

_, err := oc.Run("import-image").Args("registry.redhat.io/ubi8/ruby-30:latest", "--confirm", "--reference-policy=local").Output()
o.Expect(err).NotTo(o.HaveOccurred())

dc, err := createDeploymentConfig(oc, anotherMultiICTFixture)
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(dc.Name).To(o.Equal(dcName))
Expand Down
2 changes: 1 addition & 1 deletion test/extended/images/append.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ var _ = g.Describe("[sig-imageregistry][Feature:ImageAppend] Image append", func
oc = exutil.NewCLI("image-append")

g.It("should create images by appending them", func() {
is, err := oc.ImageClient().ImageV1().ImageStreams("openshift").Get(context.Background(), "php", metav1.GetOptions{})
is, err := oc.ImageClient().ImageV1().ImageStreams("openshift").Get(context.Background(), "tools", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(is.Status.DockerImageRepository).NotTo(o.BeEmpty(), "registry not yet configured?")
registry := strings.Split(is.Status.DockerImageRepository, "/")[0]
Expand Down
2 changes: 1 addition & 1 deletion test/extended/images/extract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var _ = g.Describe("[sig-imageregistry][Feature:ImageExtract] Image extract", fu
oc = exutil.NewCLI("image-extract")

g.It("should extract content from an image", func() {
is, err := oc.ImageClient().ImageV1().ImageStreams("openshift").Get(context.Background(), "php", metav1.GetOptions{})
is, err := oc.ImageClient().ImageV1().ImageStreams("openshift").Get(context.Background(), "tools", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(is.Status.DockerImageRepository).NotTo(o.BeEmpty(), "registry not yet configured?")
registry := strings.Split(is.Status.DockerImageRepository, "/")[0]
Expand Down
3 changes: 1 addition & 2 deletions test/extended/templates/templateinstance_readiness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ var _ = g.Describe("[sig-devex][Feature:Templates] templateinstance readiness te
g.Context("", func() {
g.BeforeEach(func() {
// Tests that push to an ImageStreamTag need to wait for the internal registry hostname
// HACK - wait for OpenShift namespace imagestreams to ensure apiserver has right hostname
err := exutil.WaitForOpenShiftNamespaceImageStreams(cli)
_, err := exutil.WaitForInternalRegistryHostname(cli)
o.Expect(err).NotTo(o.HaveOccurred())

err = cli.Run("create").Args("-f", templatefixture).Execute()
Expand Down
9 changes: 3 additions & 6 deletions test/extended/testdata/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions test/extended/testdata/deployments/deployment-example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,13 @@ spec:
- ruby
from:
kind: ImageStreamTag
name: ruby:latest
namespace: openshift
name: ruby-30:latest
type: ImageChange
- imageChangeParams:
automatic: true
containerNames:
- postgresql
from:
kind: ImageStreamTag
name: postgresql:latest
namespace: openshift
name: postgresql-13:latest
type: ImageChange
3 changes: 1 addition & 2 deletions test/extended/testdata/deployments/multi-ict-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,5 @@ spec:
- ruby2
from:
kind: ImageStreamTag
name: ruby:latest
namespace: openshift
name: ruby-30:latest
type: ImageChange