Skip to content

OCPBUGS-85608: Fix for OCP E2E Flakiness - [sig-cli] oc adm release extract image-references [Suite:openshift/conformance/parallel] #31175

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

Open
YamunadeviShanmugam wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −5
Open

OCPBUGS-85608: Fix for OCP E2E Flakiness - [sig-cli] oc adm release extract image-references [Suite:openshift/conformance/parallel] #31175

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
22 changes: 17 additions & 5 deletions test/extended/cli/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"k8s.io/apiserver/pkg/storage/names"
"k8s.io/kubernetes/test/e2e/framework"

"github.com/openshift/origin/test/extended/testdata"
exutil "github.com/openshift/origin/test/extended/util"
)

Expand Down Expand Up @@ -547,10 +546,23 @@ var _ = g.Describe("[sig-cli] oc adm", func() {
})

g.It("release extract image-references", func() {
expected := string(testdata.MustAsset("test/extended/testdata/cli/test-release-image-references.json"))
out, err := oc.Run("adm", "release", "extract").Args("--file", "image-references", "quay.io/openshift-release-dev/ocp-release:4.13.0-rc.0-x86_64").Output()
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(out).To(o.Equal(expected))
payloadImage, err := oc.AsAdmin().Run("get").Args("clusterversion", "version", "-o", "jsonpath={.status.desired.image}").Output()
Comment thread
YamunadeviShanmugam marked this conversation as resolved.
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to get current payload image from clusterversion")
payloadImage = strings.TrimSpace(payloadImage)
o.Expect(payloadImage).NotTo(o.BeEmpty())
cleanup, regArgs, err := exutil.PrepareImagePullSecretAndCABundle(ocns)
if cleanup != nil {
defer cleanup()
}
o.Expect(err).NotTo(o.HaveOccurred(), "PrepareImagePullSecretAndCABundle failed")
args := append([]string{"--file", "image-references"}, regArgs...)
args = append(args, payloadImage)
out, err := oc.AsAdmin().Run("adm", "release", "extract").Args(args...).Output()
o.Expect(err).NotTo(o.HaveOccurred(), "oc adm release extract failed with error")

o.Expect(out).To(o.ContainSubstring(`"kind": "ImageStream"`))
o.Expect(out).To(o.ContainSubstring(`"apiVersion": "image.openshift.io/v1"`))
o.Expect(out).To(o.MatchRegexp(`"name": ".*"`), "Output should contain a valid name field")
})

// TODO (soltysh): sync with Standa and figure out if we can get these
Expand Down