diff --git a/ci b/ci new file mode 100644 index 000000000000..6db1dc951bae --- /dev/null +++ b/ci @@ -0,0 +1 @@ +Tue Feb 1 19:36:17 EST 2022 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