From c6d09225e5544d96ae0473d9daa68cbc16715c36 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Tue, 10 Sep 2024 11:14:33 +0300 Subject: [PATCH] Use at least OCP 4.13 for Knative 1.14 components and later --- config/backstage-plugins.yaml | 2 +- config/eventing-istio.yaml | 6 +++--- config/eventing-kafka-broker.yaml | 6 +++--- config/eventing.yaml | 6 +++--- config/serverless-operator.yaml | 2 +- config/serving-net-istio.yaml | 4 ++-- config/serving-net-kourier.yaml | 4 ++-- config/serving.yaml | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/backstage-plugins.yaml b/config/backstage-plugins.yaml index 301a8d7ba..f2ffd18fb 100644 --- a/config/backstage-plugins.yaml +++ b/config/backstage-plugins.yaml @@ -9,7 +9,7 @@ config: openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" repositories: - dockerfiles: {} e2e: diff --git a/config/eventing-istio.yaml b/config/eventing-istio.yaml index 9ebc43f2c..d93344573 100644 --- a/config/eventing-istio.yaml +++ b/config/eventing-istio.yaml @@ -6,7 +6,7 @@ config: openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" release-v1.10: openShiftVersions: - skipCron: true @@ -27,14 +27,14 @@ config: openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" release-v1.15: konflux: enabled: true openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" repositories: - dockerfiles: {} e2e: diff --git a/config/eventing-kafka-broker.yaml b/config/eventing-kafka-broker.yaml index 2d651e4e4..2d7eac11e 100644 --- a/config/eventing-kafka-broker.yaml +++ b/config/eventing-kafka-broker.yaml @@ -6,7 +6,7 @@ config: openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" release-v1.10: openShiftVersions: - skipCron: true @@ -26,14 +26,14 @@ config: openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" release-v1.15: konflux: enabled: true openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" repositories: - dockerfiles: {} e2e: diff --git a/config/eventing.yaml b/config/eventing.yaml index 86aedb59e..22b4049ea 100644 --- a/config/eventing.yaml +++ b/config/eventing.yaml @@ -5,7 +5,7 @@ config: enabled: true openShiftVersions: - version: "4.15" - - version: "4.12" + - version: "4.13" release-v1.10: openShiftVersions: - skipCron: true @@ -25,13 +25,13 @@ config: release-v1.14: openShiftVersions: - version: "4.15" - - version: "4.12" + - version: "4.13" release-v1.15: konflux: enabled: true openShiftVersions: - version: "4.15" - - version: "4.12" + - version: "4.13" repositories: - dockerfiles: {} e2e: diff --git a/config/serverless-operator.yaml b/config/serverless-operator.yaml index 9282db49f..b50526989 100644 --- a/config/serverless-operator.yaml +++ b/config/serverless-operator.yaml @@ -11,7 +11,7 @@ config: - generateCustomConfigs: true version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" repositories: - customConfigs: - name: aws-ovn diff --git a/config/serving-net-istio.yaml b/config/serving-net-istio.yaml index 1d50f3b65..797409471 100644 --- a/config/serving-net-istio.yaml +++ b/config/serving-net-istio.yaml @@ -16,14 +16,14 @@ config: openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" release-v1.15: konflux: enabled: true openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" repositories: - dockerfiles: {} ignoreConfigs: {} diff --git a/config/serving-net-kourier.yaml b/config/serving-net-kourier.yaml index 8a90d9c30..3bd7c9abf 100644 --- a/config/serving-net-kourier.yaml +++ b/config/serving-net-kourier.yaml @@ -16,14 +16,14 @@ config: openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" release-v1.15: konflux: enabled: true openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" repositories: - dockerfiles: {} ignoreConfigs: {} diff --git a/config/serving.yaml b/config/serving.yaml index 28c80a9fa..ad714dc71 100644 --- a/config/serving.yaml +++ b/config/serving.yaml @@ -6,7 +6,7 @@ config: openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" skipDockerFilesMatches: - openshift/ci-operator/knative-perf-images.* skipE2EMatches: @@ -30,14 +30,14 @@ config: openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" release-v1.15: konflux: enabled: true openShiftVersions: - version: "4.15" - onDemand: true - version: "4.12" + version: "4.13" repositories: - dockerfiles: matches: