From 7f044a00fe6cb49b48ee4dec27be0980b982a8e0 Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Tue, 11 Aug 2026 09:34:32 -0400 Subject: [PATCH] api: adapt hypershift verification test to be multi-module The hypershift verification test needs to be vendor both the root and api modules. --- .../config/openshift/api/openshift-api-master.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ci-operator/config/openshift/api/openshift-api-master.yaml b/ci-operator/config/openshift/api/openshift-api-master.yaml index d8d43b161704d..41f33584e1eac 100644 --- a/ci-operator/config/openshift/api/openshift-api-master.yaml +++ b/ci-operator/config/openshift/api/openshift-api-master.yaml @@ -117,6 +117,7 @@ tests: cp -Rf ./ $dir/openshift-api/ rm -rf $dir/openshift-api/vendor rm -rf $dir/openshift-client-go/vendor + # hypershift is multi-module; vendor the ./api submodule first cd $dir/api go mod edit -dropreplace github.com/openshift/api go mod edit -dropreplace github.com/openshift/client-go @@ -128,7 +129,18 @@ tests: sed -i "/github.com\/openshift\/client-go v0.0.0/ s/$/ => \.\.\/openshift-client-go/" vendor/modules.txt go mod tidy go mod vendor + # then vendor the root module, which make api uses cd ../ + go mod edit -dropreplace github.com/openshift/api + go mod edit -dropreplace github.com/openshift/client-go + go mod edit -replace github.com/openshift/api=./openshift-api + go mod edit -replace github.com/openshift/client-go=./openshift-client-go + echo "# github.com/openshift/api => ./openshift-api" >> vendor/modules.txt + echo "# github.com/openshift/client-go => ./openshift-client-go" >> vendor/modules.txt + sed -i "/github.com\/openshift\/api v0.0.0/ s/$/ => \.\/openshift-api/" vendor/modules.txt + sed -i "/github.com\/openshift\/client-go v0.0.0/ s/$/ => \.\/openshift-client-go/" vendor/modules.txt + go mod tidy + go mod vendor make api test-envtest-api-all container: from: src