Skip to content

Added a prow job for automatic merging of upstream changes into 1.9 envoy release branch #3219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 4 commits into from
Mar 18, 2021
Merged

Added a prow job for automatic merging of upstream changes into 1.9 envoy release branch #3219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
685b293
Added a prow job for automatic merging of upstream changes into 1.9 e…
Mar 15, 2021
8fd770c
Fixing the build
Mar 15, 2021
f9d2602
Fixing build failures
Mar 15, 2021
4418165
Removed auto-merge label
Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions prow/cluster/jobs/istio/envoy/istio.envoy.release-1.9.gen.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions prow/config/jobs/envoy-1.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,23 @@ jobs:
image: gcr.io/istio-testing/build-tools:release-1.9-2021-02-04T20-04-44
timeout: 4h

- name: update-envoy
types: [periodic]
interval: 24h
command:
- ../test-infra/tools/automator/automator.sh
- --org=istio
- --repo=envoy
- "--title=Automator: merge upstream changes to $AUTOMATOR_ORG/$AUTOMATOR_REPO@$AUTOMATOR_BRANCH"
- --labels=tide/merge-method-merge
- --modifier=merge_upstream_changes
- --token-path=/etc/github-token/oauth
- --cmd=VERSION="v$(cut --fields=1,2 -d. VERSION)"; git remote add upstream https://github.com/envoyproxy/envoy.git && git fetch upstream release/"${VERSION}" && git merge upstream/release/"${VERSION}"
Copy link
Copy Markdown
Contributor

@PiotrSikora PiotrSikora Mar 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea what will happen afterwards. Is this merge commit going to be pushed as-is and used in a PR, or will the Automator try to create another commit or bail? I'm looking at automator.sh, and I don't see any support for this kind of workflow.

Copy link
Copy Markdown
Contributor Author

@dmitri-d dmitri-d Mar 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't actually create a commit, just stages the changes for one; I'm not sure what will happen if there were conflicts during a merge; I'll take a closer look at automator.sh. Any chance we could test this on a dummy branch?

requirements: [github]
repos: [istio/test-infra@master]
image: gcr.io/istio-testing/build-tools:master-2021-03-01T22-30-49
timeout: 4h

resources:
default:
requests:
Expand Down
2 changes: 2 additions & 0 deletions testgrid/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ dashboards:
- name: istio_release-1.9_tools_postsubmit
- name: istio_release-1.9_release-builder_postsubmit

- name: istio_release-1.9_envoy_periodic

- name: istio_release-1.8_istio
- name: istio_release-1.8_api
- name: istio_release-1.8_client-go
Expand Down