summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-10-12Merge "ci, build/f_repos: Minor UX improvements"Alexandru Avadanii4-7/+41
2016-10-12Merge "deploy: templates: Fuel VM for Enea Armband lab"Alexandru Avadanii1-0/+88
2016-10-12Merge "[ODL] Use OpenDaylight Boron"Michal Skalski2-6/+5
2016-10-11ci, build/f_repos: Minor UX improvementsAlexandru Avadanii4-7/+41
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-11[ODL] Use OpenDaylight BoronMichal Skalski2-6/+5
ODL Boron will be used in all scenarios except bgpvpn beacuse vpnservice was removed in this release, we still will use Beryllium for this scenario. This change only replace Beryllium with Boron, it does not use any new features like odl-netvirt-openstack. Change-Id: I95264cc97f5b9e922ab3fb7dc024724d9fb83e9c Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-10-10deploy: templates: Fuel VM for Enea Armband labJosep Puigdemont1-0/+88
This is the initial VM description fit for spawning Fuel Master VMs in Enea's Pharos lab (Armband lab) [1, 2]. [1] http://www.enea.com/pharos-lab [2] https://wiki.opnfv.org/display/pharos/Enea-pharos-lab Change-Id: Ia89f9728fff0ab1c279f6200fd558d9643cf4ea5 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-10-10deploy: Fix: remove storage files explicitlyAlexandru Avadanii1-0/+2
Previous change [1] tried to move the responsibility of removing storage files (raw, iso) from our python scripts to libvirt. Although this works as expected for non-root invocations, like Armband deploys, it fails to remove raw files in Fuel@OPNFV deploys. Work around this by keeping both mechanisms (libvirt managed + python explicit handling). Related-bug: ARMBAND-128 [1] https://gerrit.opnfv.org/gerrit/#/c/22447 Change-Id: Ib846cd6071705b71d98824385835d724c729fd78 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-10-10Merge "build: Use OPNFV_GIT_SHA for ISO preparer ID"Alexandru Avadanii3-4/+8
2016-10-09build/f_repos: Allow out-of-tree .git dirAlexandru Avadanii2-2/+3
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-08build: Use OPNFV_GIT_SHA for ISO preparer IDAlexandru Avadanii3-4/+8
isoinfo -i lists the following information for Fuel@OPNFV ISO: "Data preparer id: 86aafaf5454a846c417848bb94f264c4420160f3" where the SHA hash is Fuel git repo HEAD SHA. For Armband's build system, using only the Fuel commit ID is not enough to fully describe the state of the source code, as patches are also applied to other fuel modules (as git submodules). Instead, a pointer to a valid Armband commit ID should be used. However, Armband overrides OPNFV_GIT_SHA to the Armband git repo commit hash, so the ISO metadata should also reflect this. While at it, allow product name to be overriden, to signal the commit ID should be looked up inside the Armband repository. Change-Id: I33ad490f1afe28c1d439dda40e39cee1955e0ac2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-10-06Improving robustness of repo mirror selectionStefan K. Berg1-39/+81
Change-Id: If0f5b268848439aa9d2abee099bbd985abd53d5c Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-10-06Merge "build: Use git submodules for Fuel git repos"Alexandru Avadanii30-102/+526
2016-10-05build: Use git submodules for Fuel git reposAlexandru Avadanii30-102/+526
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-10-04build/docker: CI: no tag reuse on env var changeAlexandru Avadanii1-1/+1
The previous change adding support for OPNFV build tag reuse added the get/put-cache functionality to `build/docker` just for detecting env var changes between tag creation and current build. Obviously, when building outside CI, it is up to the end user to force a docker rebuild when env vars change (this was the behavior before the tag reuse support too). An alternative approach would be removing get/put-cache completely, if we consider the env vars (http proxy related) never change for CI cached builds (seems to be true, worst case we wait 1 day for the tag to expire when it happens). This change just fixes the original intended behavior in tag reuse. JIRA: FUEL-204 Change-Id: I14666994bc334012a5198a64a4a24cd4962e4bd6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-10-04Merge "Use tacker plugin in SFC scenario"Michal Skalski3-6/+60
2016-10-04Merge "build/docker: Reuse tagged image for OPNFV build"Alexandru Avadanii3-7/+70
2016-10-03Use tacker plugin in SFC scenarioMichal Skalski3-6/+60
JIRA: FUEL-205 verify: no-cache Change-Id: I37746bf3e490f6b707de8fe56af10f1df932908c Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-10-03Merge "Integration of fuel-plugin-tacker"Michal Skalski4-1/+107
2016-10-03Merge "Simplify decrement"Michal Skalski1-1/+1
2016-10-03Integration of fuel-plugin-tackerGeorge Paraskevopoulos4-1/+107
JIRA: FUEL-205 This change integrates https://github.com/openstack/fuel-plugin-tacker to the Fuel project. Change-Id: I51b1bdeeb678e55b85393f6a9f8180fc79322e8f Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
2016-10-01build/docker: Reuse tagged image for OPNFV buildAlexandru Avadanii3-7/+70
During CI build loops, the workspace is freshly fetched, so '.docker' make target is built each time. Reuse existing 'opnfv.org/ubuntu-builder:14.04' tag if present, but enforce a configurable lifespan for this tag (currently 1 day), so it does not get stale. JIRA: FUEL-204 Change-Id: I8d1bd81f3e5e81068e9586c9bea9f43b3327eb38 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-09-29Merge "use pgrep instead of ps"Jonas Bjurel1-9/+3
2016-09-29Merge "check read access instead of isfile() for Fuel ISO"Jonas Bjurel1-1/+1
2016-09-29check read access instead of isfile() for Fuel ISORoss Brattain1-1/+1
When testing with nested virtualzation I attached the Fuel ISO to VM (/dev/sr0) running deploy.sh This failed because we expect the ISO to be a file, when it could be a device, e.g. /dev/sr0. Instead of checking isfile() check for read access. This tested with bsdtar. It can extract an ISO from a file or device. Change-Id: Ic09373cd618b33382303d9134cce4e005040de95 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2016-09-29use pgrep instead of psRoss Brattain1-9/+3
pgrep was added to procps-ng, it is more exact also replace ps -ef in wait_until_fuel_menu_up removed get_fuel_menu_pid Change-Id: I57ad9d2fabbfe5f570e0be3bfb40ef842f95902d Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2016-09-29Refactor deploy-config.py into object stylePeter Barabas1-237/+290
Change-Id: I706563e6ed1bbfd98adc5a4124ff63789f9e32fa Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-09-29Merge "[odl-l3] Get OVS plugin into the action"Michal Skalski2-0/+10
2016-09-28Merge "Support different format of fuel task info"Michal Skalski1-2/+7
2016-09-28Simplify decrementPeter Barabas1-1/+1
Change-Id: I5ad9ee013cc3ac07e75b4c94d71af3c9fd46d281 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-09-28Merge "Add DHA adapter dependencies"Michal Skalski1-2/+4
2016-09-27Support different format of fuel task infoMichal Skalski1-2/+7
As described in this bug: https://bugs.launchpad.net/fuel/+bug/1625518 json output of the task can be in different format: single dict or list of dicts. During tests of https://gerrit.opnfv.org/gerrit/21807 only the later one was visible, try to support both types of output. Change-Id: I7d3e12270c8246b03bdc6c73d3be77a039df469f Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-09-27Merge "Change the way how we track deployment"Michal Skalski1-35/+76
2016-09-27Merge "deploy: fix: remove storage files during cleanup"Jonas Bjurel1-3/+1
2016-09-27Add DHA adapter dependenciesPeter Barabas1-2/+4
Change-Id: Ia83782ac6baed0f9d753b69b18202abaafb972e5 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-09-26Added Alexandru Avadanii as committer to Fuel@OPNFVJonas Bjurel1-0/+1
A Majority of the Fuel@OPNFV committers have voted for Alexandru as committer: Those include: Michal Skalski Jonas Bjurel Greg Elkinbard Stefan Berg Daniel Smith No one voted 0 or -1 Change-Id: Ib477ba126be438a11b409a85805a71734bf1a679 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-09-26Merge "Updated committer list"Gregory Elkinbard1-1/+2
2016-09-26deploy: fix: remove storage files during cleanupStefan Sicleru1-3/+1
Remove old disks through virsh instead of calling os.delete() methods so that the cleanup phase would succeed within a non-root setup. [1] Related-bug: ARMBAND-128 [1] https://gerrit.opnfv.org/gerrit/#/c/19491/ Change-Id: I90007edf014c7e15a68b9a334fcaffaa127ee4ab Signed-off-by: Stefan Sicleru <stefan.sicleru@enea.com>
2016-09-26[odl-l3] Get OVS plugin into the actionMichael Polenchuk2-0/+10
Update ovs version to 2.5+ in order to get inserted security group connection tracking flows in ovsdb, which allows to pass tempest scenario of test_network_basic_ops. JIRA: FUEL-199 Change-Id: Id3e6c8ed2b79c4b6b4a7623f0d262c63f1d1d89f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-09-23Change the way how we track deploymentMichal Skalski1-35/+76
Use fuel2 for start deployment. Since it does not return progress use deployment task to provide this information. Currently used 'deploy-changes' will behave the same: https://bugs.launchpad.net/fuel/+bug/1565026 Try to handle situation when nodes temporary go offline. With deploy-changes environment still was in 'new' state in this situtation which causes timeouts from jenkins. JIRA: FUEL-196 Change-Id: I6548a5ec807551388e845044c282b7af32eb9100 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-09-22[odl] Get latest changesMichael Polenchuk1-1/+1
* Fix setting bgpd password with puppet * Enable G1 garbage collector * Adding caching possiblity * Add firewall resource that opens BGP ports Change-Id: I8f779ba7356acf52967e594a1a213edf192962fc Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-09-22Merge "Templater can now read files from URLs"Michal Skalski1-11/+30
2016-09-22Merge "Refactoring"Michal Skalski1-235/+240
2016-09-22Merge "Change prints from statements to function calls"Michal Skalski1-5/+5
2016-09-21Emergency patch - fixed broken linksJonas Bjurel2-11/+11
Change-Id: I7aea7c06775cac3efeb22d2256c7acf6fbb137d5 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-09-21Merge "Fix: ISO build omits long path files"Jonas Bjurel1-0/+24
2016-09-21Merge "[performance] Disable keystone token revoke"Jonas Bjurel1-0/+44
2016-09-20Change prints from statements to function callsPeter Barabas1-5/+5
Change-Id: I378baa85bd9e1b9b535a2d4e9c8dcb34a267a6e5 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-09-20Temporary Hardcoded Ubuntu repoJonas Bjurel1-16/+18
Meanwhile we're investigating the issues with Ubuntu repo mirror selection, we will hardcode the Ubuntu repo mirror Change-Id: I776bd3a8a72dc87e00052e8ff965de1134293c7a Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-09-20[performance] Disable keystone token revokeMichael Polenchuk1-0/+44
Change-Id: I6db0bfaab5462a9a8f8de64bc1b088607d407bab Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-09-20RefactoringPeter Barabas1-235/+240
- Move function definition to its place - Add main function Change-Id: I9dd71dd2da0579e04841c9efc80f2770d0182b10 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>