summaryrefslogtreecommitdiffstats
path: root/build/config.mk
AgeCommit message (Collapse)AuthorFilesLines
2016-10-12Merge "ci, build/f_repos: Minor UX improvements"Alexandru Avadanii1-1/+5
2016-10-11ci, build/f_repos: Minor UX improvementsAlexandru Avadanii1-1/+5
After Armband rework landed of top of `build/f_repos` mechanism [1], the following minor UX improvements can also be applied to Fuel's f_repos: - set SHELL to "/bin/sh" (we don't use any bash-isms); - improve "From SHA..." removal for exported patches; - force checkout of root tag commit during clean; - silence progress during git clone (cleaner logs); - support git older than 1.8.4 in `make clean` (fix Armband deploy); FIXME: Pass TERM as Docker env var until [2] is fixed in Docker 1.13. v4 -> v5: * Moved `export TERM` to Releng, where it actually belongs [3]; * Fixed Armband deploys fail [4] by adjusting `make clean`; [1] https://gerrit.opnfv.org/gerrit/#/c/22791/ [2] https://github.com/docker/docker/issues/9299 [3] https://gerrit.opnfv.org/gerrit/#/c/22933/ [4] https://build.opnfv.org/ci/view/armband/job/\ fuel-deploy-armband-baremetal-daily-master/57/consoleText Fixes: FUEL-200 Change-Id: I80e3074f8659769e21f5b56f07c34c7a5de727bc Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-10-09build/f_repos: Allow out-of-tree .git dirAlexandru Avadanii1-0/+1
ArmbandFuel@OPNFV uses Fuel@OPNFV git repo as a submodule, so its .git dir is located outside work tree root (F_GIT_ROOT). Allow this setup by parsing `git rev-parse --git-dir` intead of harcoding git dir path. Fixes: FUEL-200 Change-Id: Ia7f3b23e9333356fe05b9ed0565218f2c7ec8eba Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-10-05build: Use git submodules for Fuel git reposAlexandru Avadanii1-25/+50
This change reworks support for cloning (fetching) and patching all Fuel components (fuel-library ... fuel-ui, see [1] for full list), both outside the ISO build process (for development purposes, like testing OPNFV patches apply cleanly to each component), and during the ISO build. The implementation relies heavily on git submodules and patches, so backporting pending upstream gerrit changes, as well as adding new out-of-upstream-tree patches, should be trivial. Also, since without tracking remotes the repos rarely change, leverage the in-place OPNFV build caching mechanism to drastically reduce the number of git clones during each build. The mechanism is detailed more in-depth in the JIRA ticket [3], and it's merely a rehash of the submodule handling in Armband, implemented initially by Stanislaw Kardach <stanislaw.kardach@cavium.com>. Pros (+ new features): - OPNFV patches for Fuel components can be applied (imported) or developed (exported) outside of the ISO build process; - git repo caching reduces the number of external pulls; - reuse the same fuel-* componets in ALL targets e.g. fuel-mirror used to employ 2 slightly different git trees; - one step closer to Fuel/Armband merge (lots of steps left though); Cons: - adds a lot complexity to solve a non-problem (handling the repos is fine in the current form, for the current goals); However, patching <fuel-astute> or <fuel-agent> seems to be quite complicated with the current mechanism, as env vars override our locally patched repos for these components). The proposed change should eliminate this issue completely. CHANGE: Aligned divergent fuel-mirror in ISO vs local repo build by applying the 302 redirect fix ("Fixed handling http redirects") [2] on top of 9.0.1 tag in fuel-mirror repo, and using that for both. This obsoleted the followking mk file: - build/f_isoroot/f_repobuild/config.mk CHANGE: Removed unused make target `get-fuel-repo` from build/config.mk. FIXME: Remote tracking is currently deactivated for all branches. Change this when remote HEAD should be tracked instead, e.g. during Newton rebase. [1] https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk#L32 [2] https://review.openstack.org/#/c/334882/ [3] https://jira.opnfv.org/browse/FUEL-200 TODO: Extend build/f_repos/README.md with info about: - branch changes; - tag bumps; - patching now supports subdirs; v5 -> v6: * Added support for nesting patches in subdirs, to be used for feature groups and related changes across submodules. E.g. Upcoming multiarch EFI support could go in: - .../f_repos/patch/fuel-agent/multiarch-efi/...; - .../f_repos/patch/fuel-astute/multiarch-efi/...; While Armband patches could go in: - .../f_repos/patch/fuel-agent/armband/...; - .../f_repos/patch/fuel-astute/armband/...; etc. v6 -> v13: * fix wrong tag used for VERSION dump; * fix wrong tag used for patches-export; * move OPNFV_TAG to main config.mk and use it in FUEL_*_COMMIT; * only run `patches-import` when patches changed / not yet applied; * only run `clean` for stale `.cacheid` (avoid re-applying patches); * allow git submodule path/name to be different (FIXED); * put-cache should only run when artifact is not already cached; * `git am`: use 3-way merge so already applied patches are gently skipped (useful for upstreaming patches from Armband); * Properly support nested patch dirs; * Colorize the output a little; JIRA: FUEL-200 Change-Id: I9dbdd9b3022896d4497d21be8dacc859730db489 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-03Allow to use Intel NICs for DPDK on Ericsson POD2Michal Skalski1-0/+4
JIRA: FUEL-161 Change-Id: I009ba7e9587f3c47d8e609c96b0666394887929e Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-21Pinning down exact Fuel 9.0.1 repo versionsMichal Skalski1-1/+16
stable/mitaka branch is open for new commits for Fuel 9.1. To not be impacted by new upstream changes point to specific commits which were used for Fuel 9.0 General Availabilit (9.0.1). JIRA: https://jira.opnfv.org/browse/FUEL-153 verify: no-cache Change-Id: I7fd8d2f11e4be6f47e39924913c48bfe7d4f2eb3 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-15Build: Allow customizing FUEL_MAIN_TAG (commit)Alexandru Avadanii1-1/+1
FUEL_MAIN_TAG is currently hard set to 9.0 (not overridable). While this is a sane assumption for the usual scenarios, Armband applies a series of patches on top of Fuel@OPNFV, hence requiring us to override this variable. WARNING: FUEL_MAIN_TAG is reused for fuel-mirror tag, so if you override this variable, make sure the same tag exists in fuel-mirror. Change-Id: Ided75cf0c3b5ad18cf7ef1ec88b5d2dc3aada511 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Stanislaw Kardach <Stanislaw.Kardach@cavium.com>
2016-05-30Build system uplift to Fuel 9.0/MitakaStefan K. Berg1-3/+3
Switching to Fuel 9.0/Mitaka for the build system. Overhaul of the patching mechanism. As bootstrap_admin_node.sh has been transitioned into an RPM (fuel-support), the lazy designer found it more simple to patch that script during the Fuel build phase than at the OPNFV ISO generation. The patch mechanism has been changed to a normal context diff instead of the orig/modified file tuples previously used. Hopefully this will require fewer manual rebases (may the fuzz be with us!). Also the ks.cfg patching has transitioned to a context based ordinary patch for the same reasons, but this is as before taking place during OPNFV ISO generation. Patch naming made more descriptive. The reaping mechanism has been slightly modified due to a change in the naming of the node files when these are generated by the Fuel CLI. IMPORTANT 1: The package cache mechanism is currently disabled, it is only possible to install Fuel with a direct internet connection. This will be fixed in a later change set! IMPORTANT 2: All plugins has been disabled! As you have re-certified your plugin with Fuel 9.0, please re-enable it in build/Makefile! Change-Id: Ia918d16a74b68f89d178e06befe6e8a7a9367bf9 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-01-29Create local mirrors for offline installationMichal Skalski1-0/+2
- switch to fuel-mirror [1] - plugin developers can create packages.yaml file with names of required packages - use custom configuration for fuel-bootstrap which always point to local repositories - delay process of bootstrap image creation until mirrors will be ready [1] https://github.com/openstack/fuel-mirror Change-Id: Ie4a47c8cc13d9ded8c6b5fe48cdcbfeb1f6277a4 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-01-17Fuel 8 upliftStefan K. Berg1-1/+1
Introducing Fuel 8 with associated changes: Improvements in usage of cgroups - they are now bind mounted from the host which solved a Docker-in-Docker problem. The cache tool (cache.mk) has a new argument "getbiweek" which is used by the top Makefile when building the Fuel ISO. This makes sure that there's a fresh build every second week even if the cache is not purged automatically based on its meta data. This is something we should add everywhere (in a separate change set). And obviously, Fuel is now building from stable/8.0 upstream. NOTE! f_repobuild has been disabled for now, it throws an error when run. Will be fixed separately. Change-Id: I7e2ee737fd3bedc75f58539fbc3c5fd1fa08cfa1 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-11-27Restructcture of the directory layoutJonas Bjurel1-0/+20
Restructure of the directory layout due to move of Fuel into it's own repo JIRA: FUEL-85 Change-Id: I3647e1992a508f29dce06a5d6c790725c527f6f5 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>