Skip to content
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.

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

Cherry-pick a variety of changes into 1.4.1 #1832

Merged
merged 7 commits into from
Jun 23, 2018

Conversation

zjs
Copy link
Member

@zjs zjs commented Jun 20, 2018

(Note: This must be submitted with the "rebase & merge" option, not "squash & merge".)

Cherry-pick a variety of work from master to releases/1.4.1 to include in 1.4.1-rc1. This should be a series of independent PRs, but I'm posting this all at once to allow a quicker turn-around cycle.

Cherry picks:


VIC Appliance Checklist:

  • Up to date with releases/1.4.1 branch
  • Added tests
  • Considered impact to upgrade
  • Tests passing
  • Updated documentation
  • Impact assessment checklist

@zjs zjs self-assigned this Jun 20, 2018
@zjs zjs requested a review from hickeng June 20, 2018 22:10
@zjs zjs force-pushed the topic/pre-1.4.1-rc1-cherry-picks branch 3 times, most recently from fc4af37 to 2cd0303 Compare June 21, 2018 02:08
Copy link
Member

@hickeng hickeng left a comment

Choose a reason for hiding this comment

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

Approved, despite my curiosity about space consumers.

@@ -177,8 +177,8 @@ fi

# These sizes are minimal for install, since partitions are resized to full disk space after firstboot.
IMAGESIZES=(
"4GiB"
"1GiB"
"6GiB"
Copy link
Member

Choose a reason for hiding this comment

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

I would like to know what impact this has on the packaged size of the product and what is consuming the extra space.

@zjs zjs force-pushed the topic/pre-1.4.1-rc1-cherry-picks branch 2 times, most recently from ae8cd74 to 2bdebcc Compare June 23, 2018 05:48
@zjs
Copy link
Member Author

zjs commented Jun 23, 2018

Successful CI: https://ci-vic.vmware.com/vmware/vic-product/5416/
(prior to adjusting commit messages to include this PR number)

andrewtchin and others added 7 commits June 22, 2018 23:21
Changes the ovf key names for management_portal.port and
registry.port so they do not conflict on the HTML5 client in
vSphere 6.7. Fixes vmware#1624.

(cherry picked from commit 7c07bfe)
Pulls release versions of ova components during release
tags or a push to a releases branch. Uses gcloud credentials
to pull in latest tagged version of vic-machine-server.
Fixes vmware#397.

(cherry picked from commit 914d606)
Slightly increases the disk size of the ova during the
installer build process. Fixes a syntax error during the
manifest generation and removes target disk loops
during disk export. Fixes vmware#1725.

(cherry picked from commit 7a3d847)
@zjs zjs force-pushed the topic/pre-1.4.1-rc1-cherry-picks branch from 2bdebcc to 257dfbe Compare June 23, 2018 06:22
@zjs zjs merged commit f52b38e into vmware:releases/1.4.1 Jun 23, 2018
zjs pushed a commit that referenced this pull request Jun 23, 2018
zjs pushed a commit that referenced this pull request Jun 23, 2018
Changes the ovf key names for management_portal.port and
registry.port so they do not conflict on the HTML5 client in
vSphere 6.7. Fixes #1624.

(cherry picked from commit 7c07bfe)
zjs pushed a commit that referenced this pull request Jun 23, 2018
zjs pushed a commit that referenced this pull request Jun 23, 2018
zjs pushed a commit that referenced this pull request Jun 23, 2018
(cherry picked from commit 6bbb3a7)
zjs pushed a commit that referenced this pull request Jun 23, 2018
Pulls release versions of ova components during release
tags or a push to a releases branch. Uses gcloud credentials
to pull in latest tagged version of vic-machine-server.
Fixes #397.

(cherry picked from commit 914d606)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants