From 9e569783fc370765c7b7f7fa4755835f9e2dfb33 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Tue, 1 Feb 2022 15:44:22 +0200 Subject: [PATCH 1/2] fix pdb --- openshift/e2e-common.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openshift/e2e-common.sh b/openshift/e2e-common.sh index 48959ed210f4..f206e1733852 100644 --- a/openshift/e2e-common.sh +++ b/openshift/e2e-common.sh @@ -248,6 +248,10 @@ EOF } function create_configmaps(){ + # Keep this until OCP 4.12. + # Check https://github.com/openshift/knative-serving/pull/1037#issuecomment-1021827931 for more. + sed -i -e "s|policy/v1|policy/v1beta1|g" openshift/release/knative-serving-ci.yaml + # Create configmap to use the latest manifest. oc create configmap ko-data-serving -n $OPERATORS_NAMESPACE --from-file="openshift/release/knative-serving-ci.yaml" || return $? From a0970addd39732af77b9cf4746d874936ad3d3e5 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Wed, 2 Feb 2022 12:58:03 +0200 Subject: [PATCH 2/2] change applied patches pos --- openshift/e2e-common.sh | 4 ---- openshift/release/update-to-head.sh | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/openshift/e2e-common.sh b/openshift/e2e-common.sh index f206e1733852..48959ed210f4 100644 --- a/openshift/e2e-common.sh +++ b/openshift/e2e-common.sh @@ -248,10 +248,6 @@ EOF } function create_configmaps(){ - # Keep this until OCP 4.12. - # Check https://github.com/openshift/knative-serving/pull/1037#issuecomment-1021827931 for more. - sed -i -e "s|policy/v1|policy/v1beta1|g" openshift/release/knative-serving-ci.yaml - # Create configmap to use the latest manifest. oc create configmap ko-data-serving -n $OPERATORS_NAMESPACE --from-file="openshift/release/knative-serving-ci.yaml" || return $? diff --git a/openshift/release/update-to-head.sh b/openshift/release/update-to-head.sh index c3ed2532578c..ab2344e2160e 100755 --- a/openshift/release/update-to-head.sh +++ b/openshift/release/update-to-head.sh @@ -13,16 +13,16 @@ git checkout upstream/main -B release-next # Update openshift's main and take all needed files from there. git fetch openshift main git checkout openshift/main openshift OWNERS_ALIASES OWNERS Makefile -make generate-dockerfiles -make RELEASE=ci generate-release -git add openshift OWNERS_ALIASES OWNERS Makefile -git commit -m ":open_file_folder: Update openshift specific files." - # Apply patches . git apply openshift/patches/* git add . git commit -am ":fire: Apply carried patches." +make generate-dockerfiles +make RELEASE=ci generate-release +git add openshift OWNERS_ALIASES OWNERS Makefile +git commit -m ":open_file_folder: Update openshift specific files." + git push -f openshift release-next # Trigger CI