search

OpenXT / openxt

Base OpenXT build scripts
48 stars 39 forks source link

OXT-993: Build using layer data, version and scripts from the branch being built instead of a static copy #233

Closed dozylynx closed 7 years ago

dozylynx commented 7 years ago

Signed-off-by: Christopher Clark christopher.clark6@baesystems.com

dozylynx commented 7 years ago

Branch has been refreshed with revised version for review prior to commencing testing. A corresponding PR to stable-6 branch to update build scripts and layer files will follow shortly.

dozylynx commented 7 years ago

stable-6 PR is #234

jean-edouard commented 7 years ago

I all looks pretty good now, thanks :)

Would it be possible to make one last change here, so that it's included in my tests? Now that we clone the right openxt.git, we should also use it for the version file, which has really nothing to do as a static copy in the build user's home (dunno what I was thinking there...) Could you maybe just source ${BUILD_DIR_PATH}/build-openxt/version instead of source version in build.sh (it's ok to source the file later than it currently is), and remove the cp and chown in setup.sh (https://github.com/OpenXT/openxt/blob/master/build-scripts/setup.sh#L284)?

That would be ideal, otherwise it's fine I can just do another PR after merging yours.

Thanks

dozylynx commented 7 years ago

A quick test building master with layer files and container build scripts removed from the build user home directory looks fine: it's using the per-build cloned copies of scripts and layer definitions. I do not have a Windows test environment to hand at the moment, so having the community builder exercise that would be helpful. Also tested with stable-6 via a quick hack to the master build.sh to clone the per-build openxt.git from my stable-6 PR branch, and that looks OK too: it installs xenclient-oe as required.

jean-edouard commented 7 years ago

Many hacks in the builder need to be updated for this... Please wait for my +1 to merge, to avoid breaking the builder.

jean-edouard commented 7 years ago

Builder fixed. Built here: http://openxt-builder.ainfosec.com:8010/builders/openxt/builds/698 Everything look ok. Since this PR can have a big impact on stuff, I will merge it tomorrow. Hopefully before then someone else will pass by and give this a second review.

jean-edouard commented 7 years ago

Will merge soon. For clarity, it could be useful to rename this PR to reflect the changes.