summaryrefslogtreecommitdiffstats
path: root/build/f_repos
AgeCommit message (Collapse)AuthorFilesLines
2017-05-29[mcp] Mend installation scriptsMichael Polenchuk12-0/+0
* add/unify ssh options * get base image to temporary directory * specify os type for virt install * fix symbolic link to reclass * remove outdated fuel submodules Change-Id: I6833ce78c8fff97e1b89f4e92e6e6b470e9ce99f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-04-09fuel-menu: Align defaults w/ OPNFV bootstrap cfgAlexandru Avadanii1-0/+66
Instead of overwriting fuel_bootstrap_cli.yaml during post-install, with a static config which we need to manually sync in OPNFV after each upstream change, make the whole thing dynamic by syncing (via patch) fuel-menu's default settings with OPNFV bootstrap. This allows us to drop the static fuel_bootstrap_cli.yaml. JIRA: FUEL-266 Change-Id: I132f2a272c764ad0fc84b3e0e0e1222b1fab1cd2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-03-28Revert "Revert: Blueprint "bp/distributed-serialization""Michael Polenchuk3-1370/+0
This reverts commit 8b28c44a4be6beef8a71e672f543001bcc0a080f. The issue has been fixed in upstream. Change-Id: Id4ad8fb7b1ec887f8d8d1d5b18a9b33a73bda10c Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-03-26Revert: Blueprint "bp/distributed-serialization"Alexandru Avadanii3-0/+1370
Until upstream fixes bug [1], partially revert blueprint implementation [2]: - fuel-agent: no-op, we overwrite fuel_bootstrap_cli.yaml anyway; - fuel-library: no-op, keep newly added port config in place; - fuel-web: revert all blueprint related changes; NOTE: When this blueprint becomes part of Fuel@OPNFV, we need to update our "fuel_bootstrap_cli.yaml". [1] https://bugs.launchpad.net/fuel/+bug/1676197 [2] https://review.openstack.org/#/q/topic:bp/ distributed-serialization+status:merged+branch:stable/newton JIRA: FUEL-265 Change-Id: Icf392a3446e5c89c2592d1733bc1f3401b7d69ad Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-03-17Merge "f_repos: Set git patch format explicitly"Alexandru Avadanii1-1/+2
2017-03-17Revert "Increase tcp_retries2 value"Michael Polenchuk1-51/+0
This reverts commit 0b313e2c089d296232a9a7ca43e9f37d514400a0. This patch has been merged into upstream. Change-Id: I15ba6f161547b7fd928c4ed54f8a9eef58046e48 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-03-16f_repos: Set git patch format explicitlyAlexandru Avadanii1-1/+2
Skip patch format auto-detection, by setting it explicitly to "mbox". This allows adding license headers to patch files. JIRA: ARMBAND-236 Change-Id: I2b19ced80984ea98e220935c9d36836e62203bb7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-02-22f_repos: fuel-library: Sync patch w/ upstreamAlexandru Avadanii1-4/+3
Adjust patch context after upstream changes merged recently. Change-Id: I341186055e3a77620028ae1bab9cd69c70f87014 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-02-16Sync os_workers fact with upstreamMichael Polenchuk1-3/+3
The current value for os_workers performs 3x worse in many cases compared to the prevuous default of processorcount. Let's tune value to provide response times close to what processorcount had (with 2 sockets machines). Change-Id: Icecbaa18015e7fb9f5762222d69334bdf1a7566a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-02-15f_repos: patch: Rebase patches, cleanupAlexandru Avadanii6-59/+77
While at it, re-export patches to remove any redundant info: $ make patches-export Change-Id: I4ce3aba9f9d6092bade305a744738c44a936db7c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-02-15Merge "Increase tcp_retries2 value"Alexandru Avadanii1-0/+48
2017-02-15patch: fuel-main: Adjust context to match upstreamAlexandru Avadanii1-9/+9
Change-Id: I532567f0d48ceb84eb1e3afedcd9b555eab51ac9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-02-14Increase tcp_retries2 valueMichael Polenchuk1-0/+48
Change-Id: I7a01c1b56c3602eb67fc4e1aeaeb1dbd6772841a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-12-26Rework processorcount limits to os_workersMichael Polenchuk1-0/+284
JIRA: FUEL-227 Change-Id: I9186a1b0e0ef86c2efa322805c302f02c832e10f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-12-19Reduce ceilometer memory usageMichael Polenchuk1-0/+30
JIRA: FUEL-227 Change-Id: Ia18064299da7c056cb247c2f7f350e5532f2f587 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-12-15Merge "Restart sshd service instead of reload"Fedor Zhadaev1-1/+1
2016-12-14Restart sshd service instead of reloadMichael Polenchuk1-1/+1
In the middle of fuel master node bootstrap the reload of sshd service accidentally is losing main process pid, so restart it. JIRA: FUEL-237 Change-Id: I89023177e71cb6da4b9d6beff5083d345cf66db8 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-12-12build: f_repos: Re-enable Armband specific patchesAlexandru Avadanii2-0/+83
JIRA: ARMBAND-183 Change-Id: Ie43f8f9080241add1cb9d5312c774916baee0bee Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-11-29build/f_repos: Fix remote tracking, pin N HEADsAlexandru Avadanii11-2/+1
Fix two issues that went undetected until now: - remote tracking variable does not properly evaluate in CI, since there is no HEAD reference; - git submodules references still point to master branch(es) commits, although .gitmodules configure the remote tracked branch correctly; JIRA: FUEL-234 Change-Id: I96dc704e2cfe98f2e93d5fa7d7dd261e7f151238 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-11-29Turn on remote tracking of submodulesMichael Polenchuk1-3/+1
JIRA: FUEL-234 Change-Id: I916cc94f58df2f2227384c73eda556f448ac50b5 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-11-15Uplift to Fuel 10.0/NewtonStefan K. Berg26-930/+67
Build working, automated deploy working (simple test cases only). All plugins disabled, so is the generation of the local ISO cache. Both need to be re-enabled after merge of this uplift. All patches wiped, pertinent ones need to be re-enabled after the merge of this uplift. Change-Id: I978a3d4ed25a45a4b88a6e35693baac597b162c2 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-10-31Split out public_vip_ping taskMichael Polenchuk1-11/+27
Split out public_vip_ping task to avoid race condition when ping_checker resource might be started up on controllers before a primary one. JIRA: FUEL-217 Change-Id: I3c11e8403d4e1c53a7f0eac07c71f59584882332 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-10-27Shift public ping checker into deployment stageMichael Polenchuk1-0/+110
Avoid public vip failover at the end of post-deployment by moving ping_checker resource into deployment stage. Also pingd constraint has been changed to be based on score. If all the nodes failed to ping the default gw, the resource ain't stopped and remains on the last node where it was. JIRA: FUEL-212 JIRA: FUEL-217 Change-Id: I09329474cf13958499ac99bfbdf9c9055c9bcb55 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-10-24Align globals workers_max key limitMichael Polenchuk1-5/+14
JIRA: FUEL-212 Change-Id: Ie8c50d515bffbb39deb44c32da42079b4181edd3 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-10-20Rework processorcount limits to os_workersMichael Polenchuk1-0/+423
JIRA: FUEL-212 Change-Id: I1c5b8fe123406f1a96c5432d91a9ee5806c7cf62 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-10-12Merge "ci, build/f_repos: Minor UX improvements"Alexandru Avadanii2-6/+34
2016-10-11ci, build/f_repos: Minor UX improvementsAlexandru Avadanii2-6/+34
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-2/+2
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 Avadanii24-0/+630
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>