Extract systemvm.iso using bsdtar #3536

cl-k-takahashi · 2019-08-01T02:56:09Z

Signed-off-by: Kai Takahashi k-takahashi@creationline.com

Description

Extract systemvm.iso using bsdtar in injectkeys.sh if available.
With bsdtar, injectkeys.sh doesn't need to mount systemvm.iso and works even on unprivileged containers.

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

Checked that a new key is injected to systemvm.iso by running injectkeys.sh manually.

rohityadavcloud · 2019-08-01T10:21:11Z

@cl-k-takahashi how about we add bsdtar as the dependency for both debian/rpm packages? That way we can enforce CloudStack to use bsdtar?

cl-k-takahashi · 2019-08-02T01:59:33Z

@cl-k-takahashi how about we add bsdtar as the dependency for both debian/rpm packages? That way we can enforce CloudStack to use bsdtar?

@rhtyd I agree. Should I remove all 'mount' command calls from injectkeys.sh?

cl-k-takahashi · 2019-08-02T02:37:35Z

While bsdtar is available in Ubuntu and CentOS 7 official repository, it's in EPEL in CentOS 6.

cl-k-takahashi · 2019-08-02T06:28:16Z

I added bsdtar as the dependency for rpm(CentOS7)/debian packages.
The cloud.spec for CentOS 6 is untouched.

rohityadavcloud · 2019-08-02T07:49:44Z

@cl-k-takahashi I've moved the milestone to 4.14, in which we'll remove support for CentOS6 (reference https://markmail.org/message/eenfpyya2wfgd2gw), then your PR will be acceptable. Thanks.

rohityadavcloud · 2019-09-10T16:31:40Z

@blueorangutan package

blueorangutan · 2019-09-10T16:31:55Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2019-09-10T17:13:56Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-271

Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>

bsdtar can extract iso images without mounting. Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>

cl-k-takahashi · 2019-09-27T02:11:27Z

Solved a conflict: A dependency removed from debian/control: python-netaddr was removed from the debian dependency in master branch.

cl-k-takahashi · 2019-09-27T02:24:17Z

@blueorangutan package

blueorangutan · 2019-09-27T02:25:11Z

@cl-k-takahashi a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2019-09-27T02:44:30Z

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-298

rohityadavcloud · 2019-09-27T02:49:31Z

@blueorangutan test centos7 vmware-65u2

blueorangutan · 2019-09-27T02:50:11Z

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-65u2) has been kicked to run smoke tests

blueorangutan · 2019-09-27T16:46:49Z

Trillian test result (tid-389)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 48864 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3536-t389-vmware-65u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_deploy_vm_root_resize.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 75 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_00_deploy_vm_root_resize	`Failure`	320.03	test_deploy_vm_root_resize.py
test_05_rvpc_multi_tiers	`Failure`	598.88	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Error`	641.18	test_vpc_redundant.py

blueorangutan · 2019-11-21T06:12:14Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2019-11-21T06:40:41Z

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-374

rohityadavcloud · 2019-12-07T22:16:26Z

@blueorangutan package

blueorangutan · 2019-12-07T22:17:27Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2019-12-07T22:55:33Z

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-434

rohityadavcloud · 2019-12-08T05:59:48Z

@blueorangutan test centos7 vmware-65u2

blueorangutan · 2019-12-08T06:00:30Z

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-65u2) has been kicked to run smoke tests

andrijapanicsb · 2020-01-03T14:36:41Z

@blueorangutan test centos7 vmware-65u2

blueorangutan · 2020-01-03T14:37:26Z

@andrijapanicsb a Trillian-Jenkins test job (centos7 mgmt + vmware-65u2) has been kicked to run smoke tests

andrijapanicsb

LGTM

tested manually with custom keys (VMware).

andrijapanicsb · 2020-01-03T22:56:34Z

@DaanHoogland kindly take a look if you can LGTM this one.

blueorangutan · 2020-01-04T05:13:11Z

Trillian test result (tid-684)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 50741 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3536-t684-vmware-65u2.zip
Smoke tests completed. 77 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

DaanHoogland · 2020-01-04T20:19:31Z

code looks good, nice cleanup. It does change the logic concerning file permissions, though. The logic looks fine and *should {tm} work on all platforms ;), @andrijapanicsb. If you tested it, I'm fine with it.

andrijapanicsb · 2020-01-04T20:53:26Z

Yes, manually tested by injecting custom keys manually running the same command/script and verified the modified pub key present in SSVM.

DaanHoogland · 2020-01-05T14:24:29Z

👍 master or first to 4.13?

andrijapanicsb · 2020-01-05T18:08:28Z

I've tested master, but this is a change, not bugfix, so I say only master @DaanHoogland?

DaanHoogland · 2020-01-06T08:32:53Z

ok, go ahead, @andrijapanicsb ! looks good

andrijapanicsb · 2020-01-06T10:46:13Z

Mergng based on 2 x reviews and manual testing and regression testing (no failures).

This reverts commit 8a55c93.

DaanHoogland · 2020-01-13T11:29:25Z

@cl-k-takahashi Can you please see the comments in #3800 and resubmit this? I don't think the change will be big, but it a very specific error during upgrades that needs addressing. Sorry for the invconvenience.

This reverts commit 8a55c93.

* Extract systemvm.iso using bsdtar if available. Signed-off-by: Kai Takahashi <k-takahashi@creationline.com> * New dependency for CentOS 7 and Debian: bsdtar bsdtar can extract iso images without mounting. Signed-off-by: Kai Takahashi <k-takahashi@creationline.com> * Remove all 'mount' and 'umount' command call(s). Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>

This reverts commit 8a55c93.

Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>

rohityadavcloud added this to the 4.13.1.0 milestone Aug 1, 2019

rohityadavcloud modified the milestones: 4.13.1.0, 4.13.0.0, 4.14.0.0 Aug 2, 2019

cl-k-takahashi changed the base branch from 4.12 to master August 2, 2019 08:29

svenvogel added type:enhancement component:networking labels Aug 6, 2019

rohityadavcloud requested review from PaulAngus, andrijapanicsb and wido September 10, 2019 22:16

cl-k-takahashi force-pushed the patch-injectkeys-bsdtar branch from c4755a8 to afb9115 Compare September 27, 2019 01:59

cl-k-takahashi added 2 commits September 27, 2019 11:07

Extract systemvm.iso using bsdtar if available.

1d51930

Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>

New dependency for CentOS 7 and Debian: bsdtar

99acfcf

bsdtar can extract iso images without mounting. Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>

cl-k-takahashi force-pushed the patch-injectkeys-bsdtar branch from afb9115 to 99acfcf Compare September 27, 2019 02:07

andrijapanicsb approved these changes Jan 3, 2020

View reviewed changes

andrijapanicsb merged commit 8a55c93 into apache:master Jan 6, 2020

cl-k-takahashi deleted the patch-injectkeys-bsdtar branch January 6, 2020 13:00

anuragaw pushed a commit to shapeblue/cloudstack that referenced this pull request Jan 10, 2020

Revert "Extract systemvm.iso using bsdtar (apache#3536)"

0a3fdc5

This reverts commit 8a55c93.

andrijapanicsb mentioned this pull request Jan 13, 2020

Revert "Extract systemvm.iso using bsdtar (#3536)" #3800

Merged

5 tasks

andrijapanicsb pushed a commit that referenced this pull request Jan 13, 2020

Revert "Extract systemvm.iso using bsdtar (#3536)" (#3800)

1771727

This reverts commit 8a55c93.

Spaceman1984 pushed a commit to shapeblue/cloudstack that referenced this pull request Jan 17, 2020

Revert "Extract systemvm.iso using bsdtar (apache#3536)" (apache#3800)

da02f16

This reverts commit 8a55c93.

ustcweizhou pushed a commit to ustcweizhou/cloudstack that referenced this pull request Feb 28, 2020

Revert "Extract systemvm.iso using bsdtar (apache#3536)" (apache#3800)

1c33b2b

This reverts commit 8a55c93.

cl-k-takahashi added a commit to cl-k-takahashi/cloudstack that referenced this pull request Apr 2, 2020

Inject keys into systemvm.iso (related to apache#3536)

48453ea

Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>

cl-k-takahashi added a commit to cl-k-takahashi/cloudstack that referenced this pull request Apr 2, 2020

Inject keys into systemvm.iso using bsdtar (related to apache#3536)

ab4e64e

Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>

cl-k-takahashi mentioned this pull request Apr 6, 2020

Inject keys into systemvm.iso using bsdtar (related to #3536) #4015

Closed

5 tasks

Extract systemvm.iso using bsdtar #3536

Extract systemvm.iso using bsdtar #3536

Uh oh!

Conversation

cl-k-takahashi commented Aug 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

rohityadavcloud commented Aug 1, 2019

Uh oh!

cl-k-takahashi commented Aug 2, 2019

Uh oh!

cl-k-takahashi commented Aug 2, 2019

Uh oh!

cl-k-takahashi commented Aug 2, 2019

Uh oh!

rohityadavcloud commented Aug 2, 2019

Uh oh!

rohityadavcloud commented Sep 10, 2019

Uh oh!

blueorangutan commented Sep 10, 2019

Uh oh!

blueorangutan commented Sep 10, 2019

Uh oh!

cl-k-takahashi commented Sep 27, 2019

Uh oh!

cl-k-takahashi commented Sep 27, 2019

Uh oh!

blueorangutan commented Sep 27, 2019

Uh oh!

blueorangutan commented Sep 27, 2019

Uh oh!

rohityadavcloud commented Sep 27, 2019

Uh oh!

blueorangutan commented Sep 27, 2019

Uh oh!

blueorangutan commented Sep 27, 2019

Uh oh!

blueorangutan commented Nov 21, 2019

Uh oh!

blueorangutan commented Nov 21, 2019

Uh oh!

rohityadavcloud commented Dec 7, 2019

Uh oh!

blueorangutan commented Dec 7, 2019

Uh oh!

blueorangutan commented Dec 7, 2019

Uh oh!

rohityadavcloud commented Dec 8, 2019

Uh oh!

blueorangutan commented Dec 8, 2019

Uh oh!

andrijapanicsb commented Jan 3, 2020

Uh oh!

blueorangutan commented Jan 3, 2020

Uh oh!

andrijapanicsb left a comment

Choose a reason for hiding this comment

Uh oh!

andrijapanicsb commented Jan 3, 2020

Uh oh!

blueorangutan commented Jan 4, 2020

Uh oh!

DaanHoogland commented Jan 4, 2020

Uh oh!

andrijapanicsb commented Jan 4, 2020

Uh oh!

DaanHoogland commented Jan 5, 2020

Uh oh!

andrijapanicsb commented Jan 5, 2020

Uh oh!

DaanHoogland commented Jan 6, 2020

Uh oh!

andrijapanicsb commented Jan 6, 2020

Uh oh!

DaanHoogland commented Jan 13, 2020

Uh oh!

cl-k-takahashi commented Aug 1, 2019 •

edited

Loading