From 8ff319c4f61b6f3172290074eacd3060b509415f Mon Sep 17 00:00:00 2001 From: Serverless QE Robot Date: Sun, 30 Jan 2022 19:35:33 -0500 Subject: [PATCH 1/3] :robot: Triggering CI on branch 'release-next' after synching to upstream/main --- ci | 1 + 1 file changed, 1 insertion(+) create mode 100644 ci diff --git a/ci b/ci new file mode 100644 index 000000000000..91b411d2fc26 --- /dev/null +++ b/ci @@ -0,0 +1 @@ +Sun Jan 30 19:35:33 EST 2022 From 0ad266198684cec786a37c704c31e6253c77eed1 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Mon, 31 Jan 2022 23:04:38 +0200 Subject: [PATCH 2/3] fix pbd --- openshift/e2e-common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openshift/e2e-common.sh b/openshift/e2e-common.sh index 48959ed210f4..c13315567b9d 100644 --- a/openshift/e2e-common.sh +++ b/openshift/e2e-common.sh @@ -248,6 +248,8 @@ EOF } function create_configmaps(){ + 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 285b4cedb50a0cfe0e8962392e08eafb2b545ec2 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Tue, 1 Feb 2022 15:44:22 +0200 Subject: [PATCH 3/3] try apply patches earlier --- ci | 2 +- openshift/e2e-common.sh | 2 -- openshift/release/update-to-head.sh | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ci b/ci index 91b411d2fc26..6db1dc951bae 100644 --- a/ci +++ b/ci @@ -1 +1 @@ -Sun Jan 30 19:35:33 EST 2022 +Tue Feb 1 19:36:17 EST 2022 diff --git a/openshift/e2e-common.sh b/openshift/e2e-common.sh index c13315567b9d..48959ed210f4 100644 --- a/openshift/e2e-common.sh +++ b/openshift/e2e-common.sh @@ -248,8 +248,6 @@ EOF } function create_configmaps(){ - 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