Skip to content

Switched to a plain string for the upstream branch name #3236

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 1 commit into from
Mar 29, 2021
Merged

Switched to a plain string for the upstream branch name #3236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 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.

2 changes: 1 addition & 1 deletion prow/config/jobs/envoy-1.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- --modifier=merge_upstream_changes
- --token-path=/etc/github-token/oauth
- --merge-repository=https://github.com/envoyproxy/envoy.git
- --merge-branch="release/$(cut --fields=1,2 -d. VERSION)"
- --merge-branch="release/v1.17"
Copy link
Copy Markdown
Member

@brian-avery brian-avery Mar 29, 2021

Choose a reason for hiding this comment

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

This will introduce additional manual steps that will have to be done on branch cutting. The Envoy version doesn't match the Istio version, which we generally pull out and populate in https://github.com/istio/test-infra/blob/master/Makefile.core.mk for each branch. If we can't do that, I'd prefer having an automatic way to pull out the version like was present in the previous PR.

I'm ok merging what is here right now as long as we can follow up and see if we can take care of this in some way that we don't expect someone to come in and make manual changes each release.

Copy link
Copy Markdown
Contributor Author

@dmitri-d dmitri-d Mar 29, 2021

Choose a reason for hiding this comment

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

sgtm

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