Prepare Release-1.6 branches #22078

johnma14 · 2020-03-11T15:08:11Z

This issue aims to track all steps needed to prepare the release 1.6 branches/builds.

Please add all steps taken here so we can document for future releases

Set up release manager team (owner: @jacob-delgado) - Make sure the new team has write access to the repositories.
(Optional) Update go dependencies. This must be done before branching so that PRs can be easily backported later. (owner: @irisdingbj: according to @howardjohn this is done ) See discussion below if this should be a pre or post branch item.
- istio/istio
- istio/pkg
- istio/api
- istio/cni
- istio/client-go
Update common-files in master. This will prevent larger differences between master and the new release as the common-files are updated after the branching (only change should be branch). (@jacob-delgado: according to @howardjohn this is automated and done)
- istio/istio
- istio/pkg
- istio/api
- istio/cni
- istio/client-go
- istio/release-builder
- istio/gogo-genproto
Adjust istio/proxy to correct version of istio/envoy (@brian-avery)
Create a release-1.6 branch in every Istio repo - run commands export org=xyz ; export repo=xyz ; (git clone git@github.com:${org}/${repo}.git && cd $repo && git checkout -b release-1.6 && git push --set-upstream origin release-1.6).
- istio/istio
- istio/pkg
- istio/api
- istio/cni
- istio/proxy
- istio/envoy
- istio/client-go
- istio/tools
- istio/common-files
- istio/gogo-genproto
- istio/release-builder
- [] Explicitly skipped: istio-releases/pipeline, istio/tests, istio/istio.io, istio/test-infra
Set up prow on release branches (@brian-avery)
- istio/istio
- istio/pkg
- istio/api
- istio/cni
- istio/proxy
- istio/envoy - does not use prow
- istio/client-go
- istio/tools
- istio/common-files
- istio/release-builder
- istio/gogo-genproto
Set up branch protection (owner: @brian-avery )
Update all repos that point to master branch of another repo to point to the release branch. master-latest-daily -> 1.6-dev (see https://discuss.istio.io/t/deprecation-notice-daily-builds/3991), latest -> 1.6-dev, git clone master to git clone release-1.5, etc. Commit a PR into every release-1.6 branch to modify every CODEOWNERS to contain only the release managers for this release. Command: export org=xyz ; export repo=xyz ; (git clone git@github.com:${org}/${repo}.git && cd $repo && git checkout release-1.6 && git checkout -b release-1.6-codeowners && echo '* @istio/release-managers-1-6' > CODEOWNERS && git add CODEOWNERS && git commit -m 'Set release managers as CODEOWNERS for release-1.6' && git push --set-upstream origin release-1.6-codeowners).
- istio/istio (@jacob-delgado)
- istio/pkg
- istio/api
- istio/cni
- istio/proxy
- istio/envoy
- istio/client-go
- istio/tools
- istio/common-files
- istio/gogo-genproto
- istio/release-builder
- istio/release-builder branch change in build.sh too!
Update common-files in new release. You first have to manually update the common/Makefile.common.mk update-common target to point to the new release and then run 'make update-common'. It may be that this step could be combined in the prior step in the 'make update-common' was done before the branch.
- istio/common-files should have the branch updated above.
- istio/istio
- istio/pkg
- istio/api
- istio/cni
- istio/client-go
- istio/gogo-genproto
- istio/proxy
- istio/release-builder
- istio/tools
Bump master to version 1.7
Stop publishing latest tags
Add new label: cherrypick/release-1.6
Run the long-running tests on the dev builds
Send an announcement on Discuss similar to https://discuss.istio.io/t/1-6-release-branch-cut/6344
Add release lock for release 1.6 in master branch of API repo.
Update build tools
- Update istio/tools to build with release-1.6 build image
- Update istio/common-files to set release-1.6 build image
Publish a beta release

The text was updated successfully, but these errors were encountered:

howardjohn · 2020-03-11T15:10:17Z

I suggest you also start keeping track of release notes on https://github.com/istio/istio/wiki/Istio-Release-1.6 or otherwise. We don't really have a formal release note process but I think doing things earlier is probably useful

johnma14 · 2020-03-11T17:41:56Z

@brian-avery @irisdingbj @jacob-delgado I just created this PR to help you track the tasks to prepare 1.6 release branch. Feel free to update this PR or open a new one for tracking 1.6 changes.

johnma14 · 2020-03-11T17:48:16Z

I updated the wiki to include the important dates to track for the release and added the release managers but we need to add the dates and your GitHub handles. I also created a copy of the testing spreadsheet for 1.6 based on 1.5: https://docs.google.com/spreadsheets/d/1hVwiDw680WI1PpB1F-pJKhCcniqmJyZKTJ3Ip49kjBI/edit#gid=569433090 as a placeholder. Feel free to edit it or completely create a new one if that makes sense for you.

jacob-delgado · 2020-04-03T17:31:12Z

Another relevant doc: https://docs.google.com/document/d/1ejb4HvPYlEchkD5klDKTMIzFZrHGJ5n5lNij8NjRE-Y/edit

howardjohn · 2020-04-24T17:15:15Z

TODO: add new label: cherrypick/release-1.6, done through istio/bots

brian-avery · 2020-04-24T17:42:24Z

1.6 cherrypick label PR is here: istio/bots#177

brian-avery · 2020-04-24T17:42:50Z

Branch protection PR is here: istio/test-infra#2612

jacob-delgado · 2020-04-24T17:54:09Z

Cleaned up the tasks. Put older comment at https://docs.google.com/document/d/1ejb4HvPYlEchkD5klDKTMIzFZrHGJ5n5lNij8NjRE-Y/edit if we need help troubleshooting it.

jacob-delgado · 2020-04-24T21:10:41Z

cc @howardjohn @fpesce

I get the following error when I try to create a branch for gogo-genproto

Switched to a new branch 'release-1.6'
ERROR: Permission to istio/gogo-genproto.git denied to jacob-delgado.
fatal: Could not read from remote repository.

This works for the other repositories.

brian-avery · 2020-04-24T21:10:50Z

PR to update CODEOWNERS and Makefile for common-files: istio/common-files#236. Based off of https://github.com/istio/common-files/pull/184/files

fpesce · 2020-04-24T21:16:19Z

cc @howardjohn @fpesce

I get the following error when I try to create a branch for gogo-genproto
Switched to a new branch 'release-1.6'
ERROR: Permission to istio/gogo-genproto.git denied to jacob-delgado.
fatal: Could not read from remote repository.
This works for the other repositories.

Weird @jacob-delgado , I haven't seen this one before. I'm not sure there is a need for particular privileges, do you want me to create the branch as a quick workaround?

jacob-delgado · 2020-04-24T21:16:58Z

Weird @jacob-delgado , I haven't seen this one before. I'm not sure there is a need for particular privileges, do you want me to create the branch as a quick workaround?

That's fine. A root cause can be done later.

brian-avery · 2020-04-24T21:49:05Z

PR for updating common-files on release-builder: istio/release-builder#213

jacob-delgado · 2020-04-24T21:49:52Z

PR for updating CODEOWNERS istio/pkg: istio/pkg#148. Based off of istio/pkg#105

jacob-delgado · 2020-04-24T21:56:26Z

PR to update CODEOWNERS and common files for istio/api: istio/api#1402 similar to istio/api#1264 and istio/api#1256

jacob-delgado · 2020-04-24T22:04:26Z

PR to update common files and CODEOWNERS for istio/cni: istio/cni#307 similar to istio/cni#238 and istio/cni#233

jacob-delgado · 2020-04-24T22:21:44Z

PR to update common files and CODEOWNERS for istio/client-go istio/client-go#108 similar to istio/client-go#42 and istio/client-go#46

jacob-delgado · 2020-04-24T22:40:53Z

PR to update common files and CODEOWNERS for istio/gogo-genproto istio/gogo-genproto#68 similar to istio/gogo-genproto#34 and istio/gogo-genproto#33

jacob-delgado · 2020-04-24T23:09:32Z

PR to update common files and CODEOWNERS for istio/tools istio/tools#914 similar to istio/tools#705. This may have more work given the previous PR

irisdingbj · 2020-04-25T08:26:30Z

PR to update common files and CODEOWNERS for istio/proxy istio/proxy#2827. similar to istio/proxy#2641

irisdingbj · 2020-04-25T08:57:04Z

PR to update common files and CODEOWNERS for istio/istio #23268 . similar to #20559

irisdingbj · 2020-04-25T09:06:06Z

PR to update CODEOWNERS for istio/envoy istio/envoy#203. similar to istio/envoy#134

brian-avery · 2020-04-25T21:30:59Z

PR to set branches for release-builder: istio/release-builder#215

brian-avery · 2020-04-25T21:46:22Z

This PR stops publishing latest for 1.6: #23273 similar to #20587

jacob-delgado · 2020-04-25T23:05:54Z

We are awaiting PR #23265 before we can launch a beta build. Envoy 14.1 is deemed necessary for Istio 1.6. The current cause of why tests are failing is being actively investigated. We will keep this updated with more information as it becomes available. Thanks for your understanding and patience.

brian-avery · 2020-04-25T23:26:29Z

PR to bump to 1.7 is here: #23274

jacob-delgado · 2020-04-26T20:44:26Z

We are awaiting PR #23265 before we can launch a beta build. Envoy 14.1 is deemed necessary for Istio 1.6. The current cause of why tests are failing is being actively investigated. We will keep this updated with more information as it becomes available. Thanks for your understanding and patience.

This was fixed and cherry picked into 1.6 via #23276. Thanks to everyone for their hard work.

brian-avery · 2020-04-29T14:35:06Z

Announcements posted and the beta is out :) Closing.

jacob-delgado · 2020-05-01T21:20:59Z

PR to build new build tools image istio/tools#932

jacob-delgado · 2020-05-01T21:21:20Z

PR to update common-files to use build image https://github.com/istio/common-files/pull/241/files

jacob-delgado · 2020-05-06T19:21:16Z

PR to make sure Automator works correctly in istio/test-infra for release-1.6 branch: istio/test-infra#2643

brian-avery · 2020-06-05T20:58:51Z

PRs to upgrade build tools:
https://github.com/istio/tools/pull/932/files
https://github.com/istio/common-files/pull/241/files

johnma14 assigned irisdingbj, brian-avery and jacob-delgado Mar 11, 2020

istio-policy-bot added the lifecycle/needs-triage label Mar 15, 2020

johnma14 added this to the 1.6 milestone Mar 16, 2020

brian-avery modified the milestones: 1.6, Backlog Mar 24, 2020

howardjohn modified the milestones: Backlog, 1.6 Mar 25, 2020

brian-avery closed this as completed Apr 29, 2020

istio-policy-bot removed the lifecycle/needs-triage label Apr 29, 2020

ericvn mentioned this issue May 7, 2020

Automate new release branch cutting #23620

Closed

jacob-delgado mentioned this issue Jun 5, 2020

Prepare Release-1.7 branches #24473

Closed

52 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prepare Release-1.6 branches #22078

Prepare Release-1.6 branches #22078

johnma14 commented Mar 11, 2020 •

edited by jasonwzm

howardjohn commented Mar 11, 2020 •

edited

johnma14 commented Mar 11, 2020

johnma14 commented Mar 11, 2020 •

edited

jacob-delgado commented Apr 3, 2020

howardjohn commented Apr 24, 2020 •

edited

brian-avery commented Apr 24, 2020

brian-avery commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020

brian-avery commented Apr 24, 2020 •

edited

fpesce commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020 •

edited

brian-avery commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020 •

edited

jacob-delgado commented Apr 24, 2020 •

edited

jacob-delgado commented Apr 24, 2020 •

edited

jacob-delgado commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020

irisdingbj commented Apr 25, 2020 •

edited

irisdingbj commented Apr 25, 2020

irisdingbj commented Apr 25, 2020

brian-avery commented Apr 25, 2020

brian-avery commented Apr 25, 2020

jacob-delgado commented Apr 25, 2020

brian-avery commented Apr 25, 2020

jacob-delgado commented Apr 26, 2020

brian-avery commented Apr 29, 2020

jacob-delgado commented May 1, 2020

jacob-delgado commented May 1, 2020

jacob-delgado commented May 6, 2020

brian-avery commented Jun 5, 2020

Prepare Release-1.6 branches #22078

Prepare Release-1.6 branches #22078

Comments

johnma14 commented Mar 11, 2020 • edited by jasonwzm

howardjohn commented Mar 11, 2020 • edited

johnma14 commented Mar 11, 2020

johnma14 commented Mar 11, 2020 • edited

jacob-delgado commented Apr 3, 2020

howardjohn commented Apr 24, 2020 • edited

brian-avery commented Apr 24, 2020

brian-avery commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020

brian-avery commented Apr 24, 2020 • edited

fpesce commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020 • edited

brian-avery commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020 • edited

jacob-delgado commented Apr 24, 2020 • edited

jacob-delgado commented Apr 24, 2020 • edited

jacob-delgado commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020

jacob-delgado commented Apr 24, 2020

irisdingbj commented Apr 25, 2020 • edited

irisdingbj commented Apr 25, 2020

irisdingbj commented Apr 25, 2020

brian-avery commented Apr 25, 2020

brian-avery commented Apr 25, 2020

jacob-delgado commented Apr 25, 2020

brian-avery commented Apr 25, 2020

jacob-delgado commented Apr 26, 2020

brian-avery commented Apr 29, 2020

jacob-delgado commented May 1, 2020

jacob-delgado commented May 1, 2020

jacob-delgado commented May 6, 2020

brian-avery commented Jun 5, 2020

johnma14 commented Mar 11, 2020 •

edited by jasonwzm

howardjohn commented Mar 11, 2020 •

edited

johnma14 commented Mar 11, 2020 •

edited

howardjohn commented Apr 24, 2020 •

edited

brian-avery commented Apr 24, 2020 •

edited

jacob-delgado commented Apr 24, 2020 •

edited

jacob-delgado commented Apr 24, 2020 •

edited

jacob-delgado commented Apr 24, 2020 •

edited

jacob-delgado commented Apr 24, 2020 •

edited

irisdingbj commented Apr 25, 2020 •

edited