From b2b975c824c6f67ee39008acf597beb415d54174 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 27 Jul 2021 09:43:46 +0200 Subject: [PATCH 1/2] Execute the tests again Signed-off-by: Matthias Wessendorf --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 76e2482dc4e..b4318651890 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ test-conformance: .PHONY: test-conformance test-reconciler: - echo "Disabled for now" + sh openshift/e2e-rekt-tests.sh .PHONY: test-reconciler # Requires ko 0.2.0 or newer. From e0801b11ca166ed91b9205aa89d1f2b72923ce4c Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 27 Jul 2021 09:45:02 +0200 Subject: [PATCH 2/2] For now, we have to disable the ko publish, since we do not need it at all, but its causing issues on our CI Signed-off-by: Matthias Wessendorf --- .../018-rekt-test-override-kopublish.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 openshift/patches/018-rekt-test-override-kopublish.patch diff --git a/openshift/patches/018-rekt-test-override-kopublish.patch b/openshift/patches/018-rekt-test-override-kopublish.patch new file mode 100644 index 00000000000..1dd36d9c7fa --- /dev/null +++ b/openshift/patches/018-rekt-test-override-kopublish.patch @@ -0,0 +1,26 @@ +diff --git a/vendor/knative.dev/reconciler-test/pkg/images/ko.go b/vendor/knative.dev/reconciler-test/pkg/images/ko.go +index adde2080f..ff57c9d6b 100644 +--- a/vendor/knative.dev/reconciler-test/pkg/images/ko.go ++++ b/vendor/knative.dev/reconciler-test/pkg/images/ko.go +@@ -16,20 +16,7 @@ limitations under the License. + + package images + +-import ( +- "fmt" +- "os" +-) +- + // Use ko to publish the image. + func KoPublish(path string) (string, error) { +- platform := os.Getenv("PLATFORM") +- if len(platform) > 0 { +- platform = " --platform=" + platform +- } +- out, err := runCmd(fmt.Sprintf("ko publish%s -B %s", platform, path)) +- if err != nil { +- return "", err +- } +- return out, nil ++ return "", nil + }