Skip to content

Fix and re-enable test/extended/images/signatures.go #25880

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 2 commits into from
Mar 20, 2021
Merged

Fix and re-enable test/extended/images/signatures.go #25880

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
903e435
Don't use atomic: in test/extended/images/signatures.go
mtrmac Mar 4, 2021
922ee64
Re-enable test/extended/images/signatures.go
mtrmac Feb 11, 2021
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
26 changes: 16 additions & 10 deletions test/extended/images/signatures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ var _ = g.Describe("[sig-imageregistry][Serial][Suite:openshift/registry/serial]
)

g.It("can push a signed image to openshift registry and verify it", func() {
g.Skip("disable because containers/image: https://github.com/containers/image/pull/570")
g.By("building a signer image that knows how to sign images")
output, err := oc.Run("create").Args("-f", signerBuildFixture).Output()
if err != nil {
Expand Down Expand Up @@ -83,24 +82,31 @@ var _ = g.Describe("[sig-imageregistry][Serial][Suite:openshift/registry/serial]
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(out).To(o.ContainSubstring("keyring `/var/lib/origin/gnupg/secring.gpg' created"))

// Create kubeconfig for skopeo
// Create kubeconfig for oc
g.By("logging as a test user")
out, err = pod.Exec("oc login https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT --token=" + token + " --certificate-authority=/run/secrets/kubernetes.io/serviceaccount/ca.crt")
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(out).To(o.ContainSubstring("Logged in"))

// Sign and copy the memcached image into target image stream tag
// TODO: Fix skopeo to pickup the Kubernetes environment variables (remove the $KUBERNETES_MASTER)
g.By("signing the memcached:latest image and pushing it into openshift registry")
g.By("signing a just-built image and pushing it into openshift registry")
out, err = pod.Exec(strings.Join([]string{
"KUBERNETES_MASTER=https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT",
"GNUPGHOME=/var/lib/origin/gnupg",
"skopeo", "--debug", "copy", "--sign-by", "joe@foo.bar",
"skopeo", "--debug",
// Disable the default-docker: file sigstore default in /etc/containers/registries.d, so that the X-Registry-Supports-Signatures protocol is used.
// Newer versions of Skopeo default to X-R-S-S if present, this test (as of 2021-02) uses skopeo-0.1.40-11.el7_8.x86_64, which defaults to sigstore.
"--registries.d", "/this/does/not/exist",

"copy", "--sign-by", "joe@foo.bar",
"--src-creds=" + user + ":" + token,
"--dest-creds=" + user + ":" + token,
// TODO: test with this turned to true as well
"--dest-tls-verify=false",
"docker://docker.io/library/memcached:latest",
"atomic:" + signedImage,

// Expect to use /run/secrets/kubernetes.io/serviceaccount/ca.crt
"--src-cert-dir=/run/secrets/kubernetes.io/serviceaccount",
"--dest-cert-dir=/run/secrets/kubernetes.io/serviceaccount",

"docker://" + signerImage,
"docker://" + signedImage,
}, " "))
fmt.Fprintf(g.GinkgoWriter, "output: %s\n", out)
o.Expect(err).NotTo(o.HaveOccurred())
Expand Down