summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
AgeCommit message (Collapse)AuthorFilesLines
2016-10-18FIXME: build: Revert using mirror snapshotsAlexandru Avadanii1-0/+43
Armband does not yet have DEB/RPM repo snapshots, so revert upstream Fuel@OPNFV change enabling them. JIRA: ARMBAND-155 Change-Id: Ib08c36bf28a66ef38d8b33031dcbf363fb34123c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 7684dd13589cab6860e514a9c3b8043666c818da)
2016-10-12Cleanup: Remove obsolete Fuel@OPNFV patchesAlexandru Avadanii2-102/+0
Since we are now building inside docker containers, it is no longer necessary to use `python-debian` from pip repo instead of Ubuntu. Also drop repeating the repo mirror build in case of failure. NOTE: This cherry-pick DOES NOT remove Ubuntu mirror blacklists, as it does on armband/master, since Fuel@OPNFV/stable/colorado still uses the old mirror selection mechanism. Change-Id: I62890b6ae7977cd8a39c06ce17c8964e6cb1dddb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-10-12Upstream: Fuel@OPNFV: Fuel Master VM templatesAlexandru Avadanii5-197/+3
While at it, also upstream: "build: Use OPNFV_GIT_SHA for ISO preparer ID" JIRA: ARMBAND-98 JIRA: ARMBAND-146 Conflicts: patches/opnfv-fuel/0004-Fuel-VM-for-the-Enea-Armband-lab.patch patches/opnfv-fuel/0046-build-Use-OPNFV_GIT_SHA-for-ISO-preparer-ID.patch Change-Id: Ifcd7b3041d172aa492e26477c0872cd96efd90ba Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-10-12fuel-plugin-tacker: Enable build for ArmbandAlexandru Avadanii1-1/+1
JIRA: ARMBAND-143 Conflicts: armband-fuel-config.mk Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Change-Id: I388e324b39aa2cec015bc65559f4c363bc37abdd
2016-10-07Rebase: docker tag reuse context adjAlexandru Avadanii1-3/+1
Change-Id: If6a3472a2f8fe64db2469536fe4d12d88e7a61f0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 15aac10c6b474790aedfd88d80c5e9d86a7f36b2)
2016-10-06net-check: add support for faulty operstateStefan Sicleru1-0/+63
Some eth drivers, such as those for APM X-Gene Mustang Board's NICs, do not advertise operstate properly in sysfs, ie. it is advertised as "unknown" whereas ethtool shows the NIC as fully functional with link detected. This further affects "ip link show" output which is parsed within _check_iface_ready() method. Replace "ip link show" command with "ethtool" in order to obtain proper results when operstate is unknown. Launchpad bug: https://bugs.launchpad.net/fuel/+bug/1618480 Closes-bug: ARMBAND-140 Change-Id: If8e28d3720161d9ffe897b875af235561cf1062d Signed-off-by: Stefan Sicleru <stefan.sicleru@enea.com> (cherry picked from commit 42050fe09821b29b4879f77411eb558c57c302cc)
2016-09-19Rebase: updated blacklist for Ubuntu mirrorsAlexandru Avadanii1-2/+2
Change-Id: I404791b14603b4ebdd0be1010412ec77cf75a478 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit cfd8c76d1f84874504ca019398787db76cf3c007)
2016-09-19Upstream: move patches to repo-patches dirAlexandru Avadanii5-29/+16
Upstream change: [1] Slight rebase of our patches is now needed. [1] https://gerrit.opnfv.org/gerrit/#/c/20043/ Change-Id: I955ae3c5c304d8c8da6e42680c81e9255487fb68 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 957a16139281785c2a6685428f7b037d6578f08d)
2016-09-14AArch64: fuel-plugin-ovs enableAlexandru Avadanii1-1/+1
OVS-DPDK-NSH is not supported on arm64 for now, see [1] Closes: ARMBAND-46 [1] https://jira.opnfv.org/browse/ARMBAND-86 Change-Id: I79b33bab7348e297c06ff4bb2bf7cc23f21eb7e3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 5b49b2f7ea1485b56ebc7815b5a3803363ec29af)
2016-09-09FIXME: deploy: EFI: Skip re-ordering boot via IPMIAlexandru Avadanii1-0/+31
On EFI systems deploys, altering the boot order via IPMI causes issues on some specific targets. Until we agree on an uniform solution for EFI systems + IPMI boot order handling, just skip altering it via IPMI. Related-bug: ARMBAND-71 Change-Id: I7790e1e8e3540d5ab10b8d7165316a04cf58faa4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 946e599b00d0e9ebccb12eb0071eb25343ca3fac)
2016-09-08deploy: x2 timeout for fuel master installAlexandru Avadanii1-4/+10
Change-Id: I1281b0b6b9d631e371484795a53113032ebbc83c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 7561f5f237a6abf84f7fd8adff94069906aded95)
2016-09-06build: ubuntu mirror: blacklist another SE mirrorAlexandru Avadanii1-3/+6
SE mirrors are acting up lately, blacklist them: - ftp.availo.se - ftp.lysator.liu.se Change-Id: If4cc7c207fa7ce39821cc8a8f754a48f573ff374 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 812b9c2aee17342b5ba00f53b45cbc721fc4adef)
2016-09-06Merge "deploy: Attempt fixing random deploy timeouts" into stable/coloradoAlexandru Avadanii1-4/+5
2016-09-06Revert "EFI: Move patches to Fuel@OPNFV, upstream prep"Alexandru Avadanii1-198/+0
This reverts commit dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7. Change-Id: I317e0f6aa7665c28035307149e6e7d42fdf508f3 (cherry picked from commit 441caa623edf47dcf8944ed11aa3c193897dcf72)
2016-09-06Merge "Revert "submodule: Kill fuel-astute"" into stable/coloradoAlexandru Avadanii1-1/+4
2016-09-06Revert "submodule: Kill fuel-astute"Alexandru Avadanii1-1/+4
This reverts commit 41fc21bb87ee0ab245e8f6ada2ce49a45d633ede. Change-Id: I0f60787acc445555b255a92671ccf0ffe8610f78
2016-09-05Rebase: fuel-mirror upstream changesAlexandru Avadanii1-3/+1
Slight rebase after upstream change [1]. FIXME: While looking at [1], I noticed that Armband is not using the proper fuel-mirror version due to our divergent patch & build system. This should be fixed later. [1] https://gerrit.opnfv.org/gerrit/#/c/20317/ Change-Id: I55798ba1004312cd737b6613744683437e98865a (cherry picked from commit b4d5044e751801507738dc02d116436d909d2248) Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-09-05submodule: Kill fuel-astuteAlexandru Avadanii1-4/+1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 376c76d05862ed38edeb217cd9480807571491a7) Change-Id: I376c76d05862ed38edeb217cd9480807571491a7
2016-09-05EFI: Move patches to Fuel@OPNFV, upstream prepAlexandru Avadanii1-0/+198
Now we can kill fuel-astute submodule. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7) Change-Id: Ie049062bb7a41adfbb056894c0a6f411a2d8c254
2016-09-01Upstream: extra interfaces cfgAlexandru Avadanii2-205/+0
Change-Id: Ibd522813a40a0b1c385c47e65f77b1a13c860269 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6be72ecc09f8465469a0a304ffbd6abc47a12915)
2016-08-31Merge "Upstream: multiarch mirrors" into stable/coloradoAlexandru Avadanii2-280/+0
2016-08-31Merge "Upstream: delete old Fuel env if present" into stable/coloradoAlexandru Avadanii1-58/+0
2016-08-31Merge "Upstream: Fuel@OPNFV pulled patches" into stable/coloradoAlexandru Avadanii4-157/+0
2016-08-31docker: build: Fix docker connectivity lossAlexandru Avadanii1-15/+11
Change-Id: Iaabd176f4032494c8ea40fd1264dafcac01b4a43 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 662822c6f09be5b23dc3f39f85ee2f21a6d3d405)
2016-08-31Upstream: multiarch mirrorsAlexandru Avadanii2-280/+0
Change-Id: Ia54bd3955a3e3b534d8c4d8380de5870a106edc5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit e799e8f3912dac025e5be5e8c748df8b68b7d06d)
2016-08-31Upstream: Fuel@OPNFV pulled patchesAlexandru Avadanii4-157/+0
Change-Id: Ic584d9b1eb179009256de8ccacfb7669976823c6 (cherry picked from commit 7236ccc7f9fcb9163562d88455c80339fa6efd58)
2016-08-31Upstream: delete old Fuel env if presentAlexandru Avadanii1-58/+0
Change-Id: I308eb1c2bfdf0fc568e7f351078cd7a3017aae4a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 3483c7fbcc24adeec5fea80c47cceb460325efc0)
2016-08-30deploy: Attempt fixing random deploy timeoutsAlexandru Avadanii1-4/+5
Most likely, when we configure an additional interface for Fuel Master, and Network Manager is restarted, our old ssh connection is timed out and needs to be re-established before checking for fuel bootstrap process via ssh.exec_cmd. Change-Id: I44589b2e8190008c8b1035d171cbb50270dfd98c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 471627d481b5d5905d1d322f21c3285b9d729e2d)
2016-08-29build: docker: Use host's network stackAlexandru Avadanii1-0/+32
Armband build benefits (or should have) of a local mirror for "linux.enea.com", which we used to inject into the build system by host's "/etc/hosts". After Armband switched to building inside docker, this change was silently discarded by containerization. The proposed solution uses hosts's network stack in all build containers. See [1] for full description. This change simplifies the network abstraction during build by NOT containerizing the containers' networking. The original motivation was pointing to local mirrors via host's "/etc/hosts", for which an alternative solution could be passing "-v /etc/hosts:/etc/hosts". [1] https://docs.docker.com/v1.8/articles/networking/ Change-Id: I31e3c787a432af49b4799f561669a0150668b222 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6ae4e120c5f6aab6834e0ec42599e1b409a9af05)
2016-08-23fpb: Temporary fix for supporting multiple DEB verAlexandru Avadanii2-1/+56
Backport fpb change submmited in [1]. [1] https://review.openstack.org/#/c/311031/ Change-Id: I02ce8c6151799e3953587fce50cbe552a5c95c50 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit c2dd0b63510e4e882021360ab5f0287b6fc3c597)
2016-08-23Merge "Rebase: Upstream renamed ODL to FUEL_PLUGIN_ODL" into stable/coloradoAlexandru Avadanii1-3/+3
2016-08-22Rebase: Upstream renamed ODL to FUEL_PLUGIN_ODLAlexandru Avadanii1-3/+3
See Fuel@OPNFV change [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/19033/ Change-Id: I9c95a7aaec366c9e03620f1129b3cb8401385476 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit bde411ba1cccf4a0827df115deb97f2a9cfade13)
2016-08-22submodule: Kill yardstickAlexandru Avadanii1-5/+1
Since arm64 support has been proposed straight upstream [1], we no longer have to keep the git submodule for the yarstick repo. [1] https://gerrit.opnfv.org/gerrit/#/c/18883/ Change-Id: Ic8a02106ed1d26012a0767fc0444b8f8d35c54aa Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 629f39b6928c3cb36d25dc07347de47d601e847e)
2016-08-19Merge "Rebase: upstream DEA mechanism changes"Alexandru Avadanii4-185/+29
2016-08-19build: ISO refactor, use docker, enable cacheAlexandru Avadanii8-7/+487
Previously, Armband Makefile used to call Fuel@OPNFV Makefile target <iso>, instead of <all>, which resulted in bypassing using Docker for ISO building completely. Switch to <all> Makefile target, hence bringing back Docker as a build container. This change justifies moving make variables to a separate spec file, armband.mk. While at it, enable caching of builds. This requires Jenkins bash scripts to be updated for the ISO build job, done in [1]. JIRA: ARMBAND-56 [1] https://gerrit.opnfv.org/gerrit/#/c/18453/ CHANGES: - all: release (was all: build) - Common make targets now depend on submodules-init; - clean-build and clean-docker make targets have been replaced by: make clean, make deepclean; FIXME: These issues should be fixed later: - (optional) trim local repo paths from gitinfo files - only account for armband submodules in cache fingerprints; - identify size mismatch culprit Change-Id: I7d73409be44983fa21d4c09d2e07b87a33231e03 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-17Rebase: upstream DEA mechanism changesAlexandru Avadanii4-185/+29
Change-Id: I6a8a96caa095b20d85db2d4d418dd9cb121b12e4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-05Merge "def kernel-flavor: linux-image-generic-lts-xenial"Alexandru Avadanii1-0/+51
2016-08-04def kernel-flavor: linux-image-generic-lts-xenialAlexandru Avadanii1-0/+51
Ubuntu arm64: While keeping kernel 4.2 for Trusty (linux-image-generic-lts-trusty), set 4.4 backported from Xenial (linux-image-generic-lts-xenial) as default kernel for Armband ISO. Xenial kernel 4.4 for Trusty has been tested with: - AMD Softiron; - APM Mustang; - Cavium ThunderX; While at it, remove obsoleted rtc-efi fixes. Notes: - keep 4.2 kernel inside the ISO; - selecting 4.2 kernel may be done via deploy settings, by overriding kernel flavor when calling `fuel-bootstrap`; Related-bug: ARMBAND-48 Change-Id: Ice1f95939f0d7d9491befd20030740850b1a0e61 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-04Rebase: adapt patches after ovs/dpdk fixAlexandru Avadanii2-4/+2
Upstream change [1] requires us to to adapt our Fuel@OPNFV patches. [1] https://gerrit.opnfv.org/gerrit/#/c/17969/ Change-Id: I9823469df575cc929e399a6025aca6066a16e98d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-02Upstream: decouple patches, MakefileAlexandru Avadanii1-324/+0
Change-Id: I78606b3dca803c7bf1d872cf067b2bd5f8a8aa91
2016-08-02Rebase: adapt patch after deploy-config refactor.Alexandru Avadanii1-7/+4
Change-Id: I97c9c79bb342d6c7504414134649795689b5e78b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-28deploy: Fix ssh timeouts after yaml injectAlexandru Avadanii1-11/+17
JIRA: ARMBAND-59 Change-Id: I031e1c20bcb7d5bb15b26dce18364a4994f4d0d7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-28deploy: Allow DEA to override bootstrap configAlexandru Avadanii1-0/+93
Backport from upstream proposed change [1] in Fuel@OPNFV. [1] https://gerrit.opnfv.org/gerrit/#/c/17563/ Prereq for: ARMBAND-48 Change-Id: Ia5a2073532e578b663f8f45bfe90b9fe36df77cc Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-26Merge "kernel-flavor: Add linux-image-generic-lts-xenial"Alexandru Avadanii2-40/+1
2016-07-22kernel-flavor: Add linux-image-generic-lts-xenialAlexandru Avadanii2-40/+1
Ubuntu arm64: While keeping kernel 4.2 for Trusty (linux-image-generic-lts-trusty), add 4.4 backported from Xenial (linux-image-generic-lts-xenial) to Armband ISO. Xenial kernel 4.4 for Trusty has been tested with: - AMD Softiron; - APM Mustang; - Cavium ThunderX; While at it, remove obsoleted armband-rtc-efi-fix Debian package, which was only needed on targets that are not compatible with 4.4, and we plan on retiring soon. v2->v3: - keep 4.2 kernel instead of replacing it; - selecting 4.4 kernel will be done via deploy settings, by overriding kernel flavor when calling `fuel-bootstrap`; - dropped test changes, not needed when both 4.2 and 4.4 are in; TODO: - switch default kernel flavor to 4.4 when all our PODs are ready; Closes: ARMBAND-48 Change-Id: I37600f12dd01facbd552f1d2d721bc7a3e0e2750 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-22BUILD_ID: Fix git SHA one last time.Alexandru Avadanii1-1/+1
Previous commit which was supposed to fix the BUILD_ID being too long mistakenly altered the submodule code for computing the short SHA, instead of altering the Makefile. Fixes: ARMBAND-53 Change-Id: Ib1c1b3dc9592714fd86a59ae1a64001bd2930bd3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-22BUILD_ID: Fix build ID too long errAlexandru Avadanii1-1/+1
Previous change altered the BUILD_ID to include Armband commit info instead of Fuel@OPNFV info, and also a marker to indicate it comes from Armband repo. This lead to the ISO volume ID becoming too long: "Making ISO... genisoimage: Volume ID string too long make[1]: *** [iso] Error 255" While at it, change our marker from "FUEL_AARCH64" to "ARMBAND_FUEL", as our ISO should also support x86 in the future, not only arm64. Fixes: ARMBAND-53 Change-Id: I52526f1f7861aca71d16d1e6b6b2a9566a6c7d3f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-21Rebase: update patch context after upstream changeAlexandru Avadanii1-1/+1
Change-Id: Ia268e17a7a8b0c2c47209e47feb6f77394036283 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-21Rebase: Trim changes for obsoleted mirror patchAlexandru Avadanii1-43/+1
Upstream change [1] removed Czech mirror patch. [1] https://gerrit.opnfv.org/gerrit/#/c/17225/ Change-Id: Id986899aa83b3cb7d228a266b1b8a8f5a942ba49 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-21Merge "BUILD_ID: Fix incomplete git build info"Alexandru Avadanii1-0/+35