[WebAPKs] Make WebAPK update flow more sensible

[WebAPKs] Make WebAPK update flow more sensible

Previously, whenever the shell_apk in shell_apk_version.gni there was a period
of time during which
- Chrome tries to update the WebAPK because the "shell_apk" version with which
  Chrome is compiled with was updated
- The WebAPK server is unable to fulfill the update request because the new
  ShellAPK has not yet been uploaded to the WebAPK server

This CL splits shell_apk_version in shell_apk_version.gni into two variables:
|template_shell_apk_version| and |expected_shell_apk_version|

The new flow for updating android/webapk/shell_apk will be:
1) Write CL which:
   - Makes changes to code in android/webapk/shell_apk
   - Increments |template_shell_apk_version|
   This will:
   - Update the template ShellAPK which is built on the official build bot
   - Trigger an alert that the ShellAPK on the WebAPK Minting Server needs to
     be updated
   - Does not affect the "WebAPK update logic".
2) Upload new ShellAPK template to the WebAPK Minting Server
   At this point:
   - new WebAPK installs will have the updated shell.
   - Chrome will still not request updates to the new ShellAPK version
3) Write CL which:
   - Increments |expected_shell_apk_version|
   This will:
   - cause Chrome to request updates to the new ShellAPK version

BUG=708053
Review-Url: https://codereview.chromium.org/2827233006
Cr-Commit-Position: refs/heads/master@{#467708}
Committed: https://chromium.googlesource.com/chromium/src/+/d71abed75b07b4b9fc50591cbeb2b6c8874bf448

[pkotwicz, 2017-04-21 21:23:34]

Description was changed from

==========
[WebAPKs] Make WebAPK update flow more sensible

This CL splits shell_apk_version in shell_apk_version.gni into two variables:
- latest_shell_apk_version which affects the webapk template which is updated on
  the server
- expected_shell_apk_version which
==========

to

==========
[WebAPKs] Make WebAPK update flow more sensible

Previously, whenever the shell_apk in shell_apk_version.gni there was a period
of time during which
- Chrome tries to update the WebAPK because the "shell_apk" version with which
  Chrome is compiled with was updated
- The WebAPK server is unable to fulfill the update request because the new
  ShellAPK has not yet been uploaded to the WebAPK server

This CL splits shell_apk_version in shell_apk_version.gni into two variables:
|template_shell_apk_version| and |expected_shell_apk_version|

The new flow for updating android/webapk/shell_apk will be:
1) Write CL which:
   - Makes changes to code in android/webapk/shell_apk
   - Increments |template_shell_apk_version|
   This will:
   - Update the template ShellAPK which is built on the official build bot
   - Trigger an alert that the ShellAPK on the WebAPK Minting Server needs to
     be updated
   - Does not affect the "WebAPK update logic".
2) Upload new ShellAPK template to the WebAPK Minting Server
   At this point:
   - new WebAPK installs will have the updated shell.
   - Chrome will still not request updates to the new ShellAPK version
3) Write CL which:
   - Increments |expected_shell_apk_version|
   This will:
   - cause Chrome to request updates to the new ShellAPK version

BUG=708053
==========

[pkotwicz, 2017-04-21 21:24:09]

pkotwicz@chromium.org changed reviewers:
+ hanxi@chromium.org, hartmanng@chromium.org, zpeng@chromium.org

[pkotwicz, 2017-04-21 21:24:09]

Glenn, Felix and Xi can you please take a look?

[pkotwicz, 2017-04-21 21:26:46]

Patchset #2 (id:20001) has been deleted

[pkotwicz, 2017-04-21 21:26:53]

Patchset #1 (id:1) has been deleted

[Xi Han, 2017-04-24 13:41:13]

Thank you Peter for writing this CL! The new upload flow looks good. Only
comments on the naming.

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
File chrome/android/webapk/shell_apk/shell_apk_version.gni (right):

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
chrome/android/webapk/shell_apk/shell_apk_version.gni:8:
template_shell_apk_version = 3
How about |shell_apk_template_version_in_Chrome|?

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
chrome/android/webapk/shell_apk/shell_apk_version.gni:14:
expected_shell_apk_version = 3
Can we rename it to |shell_apk_template_version_on_server|?

[hartmanng, 2017-04-24 14:03:02]

lgtm, but the buildbot script will need to be updated to reflect the new name in
shell_apk_version.gni

[F, 2017-04-24 18:46:48]

lgtm

[pkotwicz, 2017-04-25 01:15:30]

pkotwicz@chromium.org changed reviewers:
+ dominickn@chromium.org

[pkotwicz, 2017-04-25 01:15:31]

Dominick, can you please take a look?

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
File chrome/android/webapk/shell_apk/shell_apk_version.gni (right):

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
chrome/android/webapk/shell_apk/shell_apk_version.gni:8:
template_shell_apk_version = 3
I have renamed this to shell_apk_template_version_on_server

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
chrome/android/webapk/shell_apk/shell_apk_version.gni:14:
expected_shell_apk_version = 3
I have renamed this to shell_apk_version_expected_by_chrome

[Xi Han, 2017-04-25 13:58:24]

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
File chrome/android/webapk/shell_apk/shell_apk_version.gni (right):

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
chrome/android/webapk/shell_apk/shell_apk_version.gni:8:
template_shell_apk_version = 3
On 2017/04/25 01:15:31, pkotwicz wrote:
> I have renamed this to shell_apk_template_version_on_server

The template is first updated in Chrome, and then on server, so we shouldn't
name it to |version_on_server|. My suggestion is to make this variable mean "the
current version of the template that is baked in Chrome" and let it reflect any
change of the template in Chrome.

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
chrome/android/webapk/shell_apk/shell_apk_version.gni:14:
expected_shell_apk_version = 3
On 2017/04/25 01:15:31, pkotwicz wrote:
> I have renamed this to shell_apk_version_expected_by_chrome

I would prefer your previous version than this one. My suggestion is different
than the one that you choose. I just notice that the naming that I suggested
doesn't match the description. The description could change to something like:
"The ShellAPK version that Chrome believes the WebAPK Minting Server has. Chrome
will try to update the WebAPK ...."

If you don't like my suggestion, please revert to your previous version for both
namings. It is up to you:)

[pkotwicz, 2017-04-25 22:29:33]

Xi can you please take another look?

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
File chrome/android/webapk/shell_apk/shell_apk_version.gni (right):

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
chrome/android/webapk/shell_apk/shell_apk_version.gni:8:
template_shell_apk_version = 3
I have reverted to the previous variable name

This variable is not "the current version which is baked into Chrome". In
particular, it does not affect Chrome.apk It affects WebApk.apk A script which
is part of the "official builders" extracts the .dex file from the compiled
WebApk.apk and uploads it to Google Cloud Storage.

Glenn's magical script to update the ShellAPK takes information from Google
Cloud Storage

[dominickn, 2017-04-26 01:02:01]

I will stamp this one Xi reviews. :)

[Xi Han, 2017-04-26 01:08:16]

lgtm with nits.

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
File chrome/android/webapk/shell_apk/shell_apk_version.gni (right):

https://codereview.chromium.org/2827233006/diff/40001/chrome/android/webapk/s...
chrome/android/webapk/shell_apk/shell_apk_version.gni:8:
template_shell_apk_version = 3
On 2017/04/25 22:29:33, pkotwicz wrote:
> I have reverted to the previous variable name
> 
> This variable is not "the current version which is baked into Chrome". In
> particular, it does not affect Chrome.apk It affects WebApk.apk A script which
> is part of the "official builders" extracts the .dex file from the compiled
> WebApk.apk and uploads it to Google Cloud Storage.
> 
> Glenn's magical script to update the ShellAPK takes information from Google
> Cloud Storage

Thanks for the explanation:)

https://codereview.chromium.org/2827233006/diff/80001/chrome/android/webapk/s...
File chrome/android/webapk/shell_apk/shell_apk_version.gni (right):

https://codereview.chromium.org/2827233006/diff/80001/chrome/android/webapk/s...
chrome/android/webapk/shell_apk/shell_apk_version.gni:13: #
|shell_apk_version_expected_by_chrome|. The version should be incremented
Please revert the description too:)

[pkotwicz, 2017-04-26 20:00:05]

Dominick, can you please take a look?

[dominickn, 2017-04-27 02:34:46]

lgtm

[pkotwicz, 2017-04-27 14:41:26]

The CQ bit was checked by pkotwicz@chromium.org

[pkotwicz, 2017-04-27 14:41:26]

The patchset sent to the CQ was uploaded after l-g-t-m from zpeng@chromium.org,
hartmanng@chromium.org, hanxi@chromium.org
Link to the patchset: https://codereview.chromium.org/2827233006/#ps100001
(title: "Merge branch 'master' into version")

[commit-bot: I haz the power, 2017-04-27 14:41:54]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-04-27 16:40:36]

CQ is committing da patch.

Bot data: {"patchset_id": 100001, "attempt_start_ts": 1493304086199610,
"parent_rev": "deb0172c664a689bff370a530764f975480443f5", "commit_rev":
"d71abed75b07b4b9fc50591cbeb2b6c8874bf448"}

[commit-bot: I haz the power, 2017-04-27 16:41:35]

Description was changed from

==========
[WebAPKs] Make WebAPK update flow more sensible

Previously, whenever the shell_apk in shell_apk_version.gni there was a period
of time during which
- Chrome tries to update the WebAPK because the "shell_apk" version with which
  Chrome is compiled with was updated
- The WebAPK server is unable to fulfill the update request because the new
  ShellAPK has not yet been uploaded to the WebAPK server

This CL splits shell_apk_version in shell_apk_version.gni into two variables:
|template_shell_apk_version| and |expected_shell_apk_version|

The new flow for updating android/webapk/shell_apk will be:
1) Write CL which:
   - Makes changes to code in android/webapk/shell_apk
   - Increments |template_shell_apk_version|
   This will:
   - Update the template ShellAPK which is built on the official build bot
   - Trigger an alert that the ShellAPK on the WebAPK Minting Server needs to
     be updated
   - Does not affect the "WebAPK update logic".
2) Upload new ShellAPK template to the WebAPK Minting Server
   At this point:
   - new WebAPK installs will have the updated shell.
   - Chrome will still not request updates to the new ShellAPK version
3) Write CL which:
   - Increments |expected_shell_apk_version|
   This will:
   - cause Chrome to request updates to the new ShellAPK version

BUG=708053
==========

to

==========
[WebAPKs] Make WebAPK update flow more sensible

Previously, whenever the shell_apk in shell_apk_version.gni there was a period
of time during which
- Chrome tries to update the WebAPK because the "shell_apk" version with which
  Chrome is compiled with was updated
- The WebAPK server is unable to fulfill the update request because the new
  ShellAPK has not yet been uploaded to the WebAPK server

This CL splits shell_apk_version in shell_apk_version.gni into two variables:
|template_shell_apk_version| and |expected_shell_apk_version|

The new flow for updating android/webapk/shell_apk will be:
1) Write CL which:
   - Makes changes to code in android/webapk/shell_apk
   - Increments |template_shell_apk_version|
   This will:
   - Update the template ShellAPK which is built on the official build bot
   - Trigger an alert that the ShellAPK on the WebAPK Minting Server needs to
     be updated
   - Does not affect the "WebAPK update logic".
2) Upload new ShellAPK template to the WebAPK Minting Server
   At this point:
   - new WebAPK installs will have the updated shell.
   - Chrome will still not request updates to the new ShellAPK version
3) Write CL which:
   - Increments |expected_shell_apk_version|
   This will:
   - cause Chrome to request updates to the new ShellAPK version

BUG=708053

Review-Url: https://codereview.chromium.org/2827233006
Cr-Commit-Position: refs/heads/master@{#467708}
Committed:
https://chromium.googlesource.com/chromium/src/+/d71abed75b07b4b9fc50591cbeb2...
==========

[commit-bot: I haz the power, 2017-04-27 16:41:36]

Committed patchset #4 (id:100001) as
https://chromium.googlesource.com/chromium/src/+/d71abed75b07b4b9fc50591cbeb2...

[timvolodine, 2017-04-28 12:13:39]

A revert of this CL (patchset #4 id:100001) has been created in
https://codereview.chromium.org/2845943006/ by timvolodine@chromium.org.

The reason for reverting is: broke official-* bots, see crbug.com/716330.