Skip to content
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.

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

Update upgrade test image template to use Konflux images #2908

Conversation

pierDipi
Copy link
Member

@pierDipi pierDipi commented Oct 2, 2024

Instead of using image mirrored, we will start using images built with Konflux, this will further help testing on different arch once we have multi-arch builds while also consolidating the images we use for building and testing

Instead of using image mirrored, we will start using images built
with Konflux, this will further help testing on different arch
once we have multi-arch builds.

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
Copy link
Contributor

openshift-ci bot commented Oct 2, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved label Oct 2, 2024
@pierDipi
Copy link
Member Author

pierDipi commented Oct 2, 2024

/test 416-test-upgrade-aws-416


# Mapping based on https://github.com/openshift/release/tree/master/core-services/image-mirroring/knative
# for non-REKT tests.
base="quay.io/openshift-knative/"
Copy link
Contributor

@mgencur mgencur Oct 2, 2024

Choose a reason for hiding this comment

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

The images you're replacing here must be multi-arch as they're used on P/Z and arm now.
See e.g. https://quay.io/repository/openshift-knative/eventing/eventshub?tab=tags&tag=latest - it's multiarch.

Copy link
Member Author

@pierDipi pierDipi Oct 2, 2024

Choose a reason for hiding this comment

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

@rudyredhat1 what's the status of multi arch builds feature in hack?

Copy link
Contributor

Choose a reason for hiding this comment

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

sorry missed this notification, checked now, I think it will take time, trying to understand how the kustomize patches can be used for the docket-build-oci-ta.yaml , i will check this weekend and will try to update something on this MR - openshift-knative/hack#316 , cc @pierDipi

@pierDipi
Copy link
Member Author

pierDipi commented Oct 2, 2024

panic: could not parse image template: template: image:14: unexpected EOF [recovered]
	panic: could not parse image template: template: image:14: unexpected EOF

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
@pierDipi
Copy link
Member Author

/test 416-test-upgrade-aws-416

@pierDipi
Copy link
Member Author

image template '{{- with .Name }}
{{- if eq .      "kafka-consumer"      }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-ekb-test-kafka-consumer@sha256:f24916fabc6a31f2aa0ffb1b4c39ea83939863eb8166041037d7fdc764455a5b
{{- else if eq . "event-sender"        }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-event-sender@sha256:371e39af87f40f6e256a6112debf1940c1a991061c05614b4023b08fd9bcfb84
{{- else if eq . "eventshub"           }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-eventshub@sha256:7c4eacac86c77e987cfedcef564c4e3c7ef1e27c244ea1a51b57319c92e0c025
{{- else if eq . "heartbeats"          }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-heartbeats@sha256:1f04abd0dc5263e1eff2abe6588e4bce46ca0e6462705166d94cbae24b46fddc
{{- else if eq . "print"               }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-print@sha256:f1ea95482fbbee6525b5991b3d9e44f441668c09709ae7b823b415138d341608
{{- else if eq . "recordevents"        }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-recordevents@sha256:e639cfecd727443a8b751446c4d46444c927a7e2b243fcc6e560519b9f52b725
{{- else if eq . "request-sender"      }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-request-sender@sha256:0b7262b87810369444bbb6d8d067ed02090588a067657140519ba437f5f7c7cf
{{- else if eq . "wathola-fetcher"     }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-fetcher@sha256:53b5d6032dfdf72b1c3cd2b8786af99179972c1918549da88caa3f25889dbc37
{{- else if eq . "wathola-forwarder"   }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-forwarder@sha256:14c9e2749456c15928924b027dd2f832d589794df7a953c2970938b51378622e
{{- else if eq . "wathola-receiver"    }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-receiver@sha256:b8f66f2473fd1366c7c44dff92c0569a7b2e2806f0e802cf6a1bc3d7052ab1d5
{{- else if eq . "wathola-sender"      }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-sender@sha256:e95dedb156d25aecbf98f517a77976eaff84546d946140636a05c1ba24195ec2
{{- else                               }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-serving-{{.}}:latest
{{end -}}'

Running go test with args: -race -count=1 -run=TestServerlessUpgradePrePost -timeout=90m -parallel=8 ./test/upgrade -tags=upgrade --kubeconfigs=/tmp/kubeconfig-3159085924 --imagetemplate={{- with .Name }}
{{- if eq .      "kafka-consumer"      }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-ekb-test-kafka-consumer@sha256:f24916fabc6a31f2aa0ffb1b4c39ea83939863eb8166041037d7fdc764455a5b
{{- else if eq . "event-sender"        }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-event-sender@sha256:371e39af87f40f6e256a6112debf1940c1a991061c05614b4023b08fd9bcfb84
{{- else if eq . "eventshub"           }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-eventshub@sha256:7c4eacac86c77e987cfedcef564c4e3c7ef1e27c244ea1a51b57319c92e0c025
{{- else if eq . "heartbeats"          }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-heartbeats@sha256:1f04abd0dc5263e1eff2abe6588e4bce46ca0e6462705166d94cbae24b46fddc
{{- else if eq . "print"               }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-print@sha256:f1ea95482fbbee6525b5991b3d9e44f441668c09709ae7b823b415138d341608
{{- else if eq . "recordevents"        }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-recordevents@sha256:e639cfecd727443a8b751446c4d46444c927a7e2b243fcc6e560519b9f52b725
{{- else if eq . "request-sender"      }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-request-sender@sha256:0b7262b87810369444bbb6d8d067ed02090588a067657140519ba437f5f7c7cf
{{- else if eq . "wathola-fetcher"     }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-fetcher@sha256:53b5d6032dfdf72b1c3cd2b8786af99179972c1918549da88caa3f25889dbc37
{{- else if eq . "wathola-forwarder"   }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-forwarder@sha256:14c9e2749456c15928924b027dd2f832d589794df7a953c2970938b51378622e
{{- else if eq . "wathola-receiver"    }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-receiver@sha256:b8f66f2473fd1366c7c44dff92c0569a7b2e2806f0e802cf6a1bc3d7052ab1d5
{{- else if eq . "wathola-sender"      }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-sender@sha256:e95dedb156d25aecbf98f517a77976eaff84546d946140636a05c1ba24195ec2
{{- else                               }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-serving-{{.}}:latest
{{end -}} --images.producer.file=/go/src/github.com/openshift-knative/serverless-operator/test/images-rekt.yaml --catalogsource=serverless-operator --channel=stable --upgradechannel=stable --csv=serverless-operator.v1.35.0 --csvprevious=serverless-operator.v1.34.0 --servingversion=1.15 --eventingversion=1.15 --kafkaversion=1.15 --servingversionprevious=1.14 --eventingversionprevious=1.14 --kafkaversionprevious=1.14 --resolvabledomain --https

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
…thub.com:pierDipi/serverless-operator into replace-upgrade-test-image-template-with-konflux
@pierDipi
Copy link
Member Author

/test 416-test-upgrade-aws-416

@pierDipi pierDipi changed the title Update upgrade test image template to use Konflux images [WIP] Update upgrade test image template to use Konflux images Oct 11, 2024
@pierDipi
Copy link
Member Author

2024/10/11 08:30:17 Got image template {{- with .Name }}
{{- if eq .      "kafka-consumer"      }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-ekb-test-kafka-consumer@sha256:73a457ba7be682dce434a3670bd450c9b89f93351e9f69dc48ad3973315eed59
{{- else if eq . "event-sender"        }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-event-sender@sha256:e21a7ee7b2b2c40ccf61f35fda422a6a6dd585d2b80c03e69ebec8d3a09f5106
{{- else if eq . "eventshub"           }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-eventshub@sha256:a3d353a712321b4abd0e3ce2d4892a1bf522769a982e122120d7d88294ed97c3
{{- else if eq . "heartbeats"          }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-heartbeats@sha256:9b85df6fa349f62e6b315996627896c49a797b5cae4c00988e9e7424b5fa2cd8
{{- else if eq . "print"               }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-print@sha256:afb09e84cf63440f7d2b88fa7add1f1de6d57678f72589aea4787f87ed5c3d51
{{- else if eq . "recordevents"        }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-recordevents@sha256:462d70182d20dbabb5857fb5d35ce2c407202184e84e12f34fcf3c83f9791cf9
{{- else if eq . "request-sender"      }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-request-sender@sha256:20065da1f68094d4810be6594867dbdbe30c51f66f514bb6a35aee7ebf179833
{{- else if eq . "wathola-fetcher"     }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-fetcher@sha256:7338092abd6d3a03d2d3909c85fb0070b96c3cd06ce60d38868113e5d6f7b26d
{{- else if eq . "wathola-forwarder"   }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-forwarder@sha256:40f53267f6bfb3682d36995f8305903bed0d0f573b99073654ce56ca46a38a74
{{- else if eq . "wathola-receiver"    }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-receiver@sha256:0a6c4ce82ae74e4bf4f3ad6eff916c12cdabd07764031f5e0ded8c0c5f47e01b
{{- else if eq . "wathola-sender"      }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-wathola-sender@sha256:f2ce77ebebf0ed197e2b57eca7b6aa9211b6a4c9e99c9d5b71232687800574d7
{{- else                               }}quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-serving-{{.}}:latest
{{end -}}

test/lib.bash Outdated Show resolved Hide resolved
test/lib.bash Outdated Show resolved Hide resolved
@pierDipi
Copy link
Member Author

/test 416-test-upgrade-aws-416

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
@pierDipi pierDipi force-pushed the replace-upgrade-test-image-template-with-konflux branch from a386d93 to ce30904 Compare October 11, 2024 10:23
@pierDipi pierDipi marked this pull request as ready for review October 11, 2024 10:24
@openshift-ci openshift-ci bot requested review from aliok and matzew October 11, 2024 10:24
@pierDipi pierDipi changed the title [WIP] Update upgrade test image template to use Konflux images Update upgrade test image template to use Konflux images Oct 11, 2024
test/lib.bash Outdated

default_knative_eventing_images
default_knative_eventing_kafka_broker_images
default_knative_serving_images

# Mapping based on https://github.com/openshift/release/tree/master/core-services/image-mirroring/knative
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment is out-of-date now. Otherwise this looks good to me now (as long as we get multiarch images later:))

Copy link
Member Author

Choose a reason for hiding this comment

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

Multi arch builds are already been built 🎉

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm. Which image are multiarch? trying e.g. this and it's "manifest", not "manifest list"

ᐅ skopeo inspect --raw docker://quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-serving-autoscaler:latest 
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"application/vnd.oci.image.config.v1+json","digest":"sha256:90744c7fe55c3b5893b4aff7098dd1392ec60c480a916a37d519ddf8d1cb8e98","size":7755},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar+gzip","digest":"sha256:133388727492505cb9d292d14f00942ad2915ab7df3ec1aabbea88cd25035f7b","size":39460227},{"mediaType":"application/vnd.oci.image.layer.v1.tar+gzip","digest":"sha256:ad929d8e8e974c0686ebc2b5a27fa5ddf62125bc5e19f0cc40a5c1dbd0e9ba47","size":28703160},{"mediaType":"application/vnd.oci.image.layer.v1.tar+gzip","digest":"sha256:7431e963fae10aee616b28966de17f86660d5943dc560bea73e4c077f6997609","size":36262}],"annotations":{"org.opencontainers.image.base.digest":"sha256:d531ff26bffe832391600e8137f01b9d09a712c721ebe966b98d647bd91bc261","org.opencontainers.image.base.name":"registry.access.redhat.com/ubi8/ubi-minimal:latest"}}

Copy link
Contributor

Choose a reason for hiding this comment

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

Or you mean, somebody is already working on that but not fully done yet.

Copy link
Member Author

Choose a reason for hiding this comment

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

Serving needs to merge their PR: openshift-knative/serving#912

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
@mgencur
Copy link
Contributor

mgencur commented Oct 14, 2024

@pierDipi Yes. The test is trying to pull quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-serving-helloworld:latest but the real image that exists is https://quay.io/repository/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-serving-test-helloworld?tab=tags

test/lib.bash Outdated Show resolved Hide resolved
Co-authored-by: Martin Gencur <mgencur@redhat.com>
@mgencur
Copy link
Contributor

mgencur commented Oct 15, 2024

/lgtm

Copy link
Contributor

openshift-ci bot commented Oct 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgencur, pierDipi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 4760538 and 2 for PR HEAD febe00e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD d354507 and 1 for PR HEAD febe00e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 1d34277 and 0 for PR HEAD febe00e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 23bc148 and 2 for PR HEAD febe00e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD b84701f and 2 for PR HEAD febe00e in total

@openshift-merge-bot openshift-merge-bot bot merged commit 9a59043 into openshift-knative:main Oct 16, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants