aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-22Merge "Store Fuel ISO in build cache as it is built"Stefan K. Berg1-0/+4
2016-01-22Restore ISO file name to make CI functional againStefan K. Berg1-2/+2
An overzealous designer :) renamed the ISO output file, which broke CI. This will put everything right again. Change-Id: I25dca7ecfaa679872ee3d670b5df56333b3321c4 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-01-22Store Fuel ISO in build cache as it is builtStefan K. Berg1-0/+4
Right not the build cache is populated after a full (successful) build. As the Fuel ISO takes some time to build, this saves quite some time in the cases where the ISO is built successfully but a following plugin build fails. Change-Id: Ic6be1f5b5d00b9436eb0f82911cf28b449d0a156 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-01-22Merge "Small updates to build-requirements for docker stuff. fixed ↵Daniel Smith1-5/+11
whitespace x2 Change-Id: Ie9d52f820400df10d88ade035f2900aecab0c66d JIRA:0 Signed-off-by: Daniel Smith <daniel.smith@ericsson.com>"
2016-01-21Use mirrors snapshotsMichal Skalski5-12/+47
Add logic to fetch information about last suitable snapshot which can be used to download ubuntu packages. This is for example use to build community ISO [1]. This should help in case of snapshot switch [2]. [1] https://github.com/fuel-infra/jenkins-jobs/blob/master/servers/fuel-ci/8.0/builders/community.all.sh#L36-L40 [2] https://bugs.launchpad.net/fuel/+bug/1493390/comments/9 Change-Id: Id5a8d41278561473ea4844631bfefa0049e64dbc Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-01-21Merge "Turn on fuelmenu by default, turn off biosdevname"Stefan K. Berg11-19/+175
2016-01-21Turn on fuelmenu by default, turn off biosdevnameStefan K. Berg11-19/+175
Added experimental Fuel build loop, rebuilding up to ten times while keeping the package cache, in the hope that all packages will be able to download. Added snapshot support into this script as well. Changed naming of OPNFV iso label to OPNFV_FUEL_<id>, made changes in ks.cfg and isolinux.cfg to look for this name at install. Change-Id: Ic28a3af769cfc90416d7d988afd6f07eadcef4f1 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-01-20Small updates to build-requirements for docker stuff.Daniel Smith1-5/+11
fixed whitespace x2 Change-Id: Ie9d52f820400df10d88ade035f2900aecab0c66d JIRA:0 Signed-off-by: Daniel Smith <daniel.smith@ericsson.com>
2016-01-20Fixed DNS and NTP serves for default virtual lab definitionsJonas Bjurel1-10/+10
Change-Id: I47a5e2b3bc0e74c44256c6733e331b89889cf9c7 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-19Scenario uplift to Fuel8Jonas Bjurel9-7/+1136
- Re arranged node-roles according to Fuel8 requirements o There must be at least 3 CephOSD nodes o Ceph-OSD cannot be co-located with Mongo o Mongo cann not run on compute Change-Id: I55b99bb4e5779170b31a56025d36b9b55a1a4da2 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-19Temporary fix for ONOS deployment scenario.Jonas Bjurel1-2/+10
- Although ONOS supports L3, this patch doesnt let the L3 capabilities of ONOS loose - this is due to OPNFV Pharos lab incompatibilities with ONOS. Hope to have a fix soon - Also provides a template for scenario short names Change-Id: Ie86bcdc23492ee0fd7a19c11eecfca07afb64df3 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-18Correction of cache handling for ISO buildStefan K. Berg1-3/+5
The cache id was not generated considering config.mk nor Makefile. Change-Id: I29ae0d60b89d4653cb38cffe83f666c5056daf63 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-01-17Merge "Fuel 8 uplift"Stefan K. Berg14-621/+1090
2016-01-17Fuel 8 upliftStefan K. Berg14-621/+1090
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>
2016-01-14Adding fuel-bgpvpn-plugin and ScenarioNikolas Hermanns3-0/+142
To use the bgpvpn fuel plugin configs where added and a first scenario using it is added Change-Id: Id3c65abe39e1945f6a451c523732a513b01db696
2016-01-14Merge "Removing CPU specification from Templates"Jonas Bjurel6-162/+0
2016-01-14Ignoring pyc and eclipse filesNikolas Hermanns1-0/+5
Change-Id: I6883c45b805ba52ed485c634300c86652c9cb9e0
2016-01-13Align scenario short names between installersFatih Degirmenci1-16/+23
The fields in scenario short name is agreed between joid and fuel as below. os-[controller]-[feature]-[mode](-[optionalparameter]) Change-Id: I3729e660c10429df0e2d8cf25e4b5a66128afa7e Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2016-01-13Merge "VLAN Segmentation scenarios needed for virtual traffic classifier"Jonas Bjurel3-0/+248
2016-01-13Removing CPU specification from TemplatesNikolas Hermanns6-162/+0
Not all the flags are supported by every machine. This patch removes the specification of cpu and lets libvirt decide what cpu model is used. Change-Id: I1f183560e47d58abcfe496838a815d3f3594ee1b
2016-01-13f_ovsnfv-dpdk-pluginbuild: Update repo locationMark D. Gray2-6/+8
The code for fuel-plugin-ovsnfv has been moved to the ovsnfv OPNFV project repository. This patch updates the OPNFV fuel plugin builder to use this location. Change-Id: Ida1640ea6005aa1f4b31be145913556d6b05aa6e Signed-off-by: Mark D. Gray <mark.d.gray@intel.com>
2016-01-13Fix build failure in fuel base & qemuRuijing Guo2-0/+19
Change-Id: I4a6cc047011547402641619a5683af3d24c057ee Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2016-01-12VLAN Segmentation scenarios needed for virtual traffic classifierJonas Bjurel3-0/+248
Change-Id: I2a42cff6f128bc0faca40bd6576c52282e66c0f4 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-12Integration of vsperf pluginJonas Bjurel4-1/+110
VERIFIED READY TO MERGE Change-Id: Ia3b01c0de1081ce24e4db361ba6e77475e8ea291 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-12Deploy Scenario bug-fixesJonas Bjurel1-2/+2
- Fixed HA defenition for ODL-L2 and ODL-L3 in scenario.yaml Change-Id: I60cbac779b2faa34f0bf96159839826e157295fe Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-11Added a few more deply.sh arguments needed by JenkinsJonas Bjurel1-8/+53
Added arguments: -B PXE Bridge for booting of Fuel master -f Deploy on existing Fuel master -F Do only create a Fuel master -H NO Health check -S Storage dir for VM images Added checks for URI formats Change-Id: I1f5138a2058e7b3274e9acf4bbbba243a427fb96 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-11Small fixes to the deployment scenario framework:Jonas Bjurel2-19/+32
- Added deploy.sh -d option for dryrun. With -d + all the other mandatory arguments, deploy.sh produces ci/config/dea.yaml and /ci/config/dha.yaml with out actually deploying the stack. - Bugfix to exit with rc <> 0 if deployment fails. - Don't delete the programatically constructed dea.yaml or dha.yaml under fuel/ci/config after deploy has finished. dea.yaml and dha.yaml are needed functest, therefore these files must not be deleted after deployment has finished. They will reside in fuel/ci/config/. - Dont merge the dha-override section in deployment scenarios with the final dha.yaml unless the deployment is virtual. There is no way you can programatically override physicall resources, wireing, ipmi set-up, etc. - while you can for virtual environments. VERIFIED READY TO MERGE Change-Id: If4dedc472e07ed60071ee34c73db29f3b9c45252 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-10ONOS scenario according to wanted config file structureJonas Bjurel6-3/+642
Replaces: - https://gerrit.opnfv.org/gerrit/#/c/5999/ - https://gerrit.opnfv.org/gerrit/#/c/6003/ Description: - Onos scenarios updated with needed dea and dha overrides, no scenario specific information in other config files such dha, dea_base, dea_pod override, etc. - Added a virtual POD for Huawei-china specific needs, i.e. DNS and NTP. - Small fix in deploy-conf.py Change-Id: I85fe2fc4e9ec5fe0bc98ae7b399f2e49af6450f9 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-08A simple method to separate configuration for base fuel, plugins, PODsJonas Bjurel30-100/+3690
and deployment/test scenarios READY TO MERGE! Replaces: https://gerrit.opnfv.org/gerrit/#/c/3995/ Abstract -------- This deployment framework relies on a configuration structure, providing base installer configuration, per POD specific configuration, plugin configuration, and deployment scenario configuration. - The base installer configuration resembles the least common denominator of all HW/POD environment and deployment scenarios (These configurations are normally carried by the the installer projects in this case (fuel@OPNFV). - Per POD specific configuration specifies POD unique parameters, the POD parameter possible to alter is governed by the Fuel@OPNFV project. - Plugin configuration - providing configuration of a specific plugin. these configurations maintain there own namespace and are normally maintained by collaborative projects building Fuel@OPNFV plugins - Deployment scenario configuration - provides a high level, POD/HW environment independent scenario configuration for a specific deployment. It defines what features/plugins that shall be deployed - as well needed overrides of the plugin config as well as the base installer-, POD/HW environment- configurations. Objects allowed to override is governed by the Fuel@OPNFV project. Executing a deployment ---------------------- deploy.sh must be executed locally at the target lab/pod/jumpserver A lab configuration structure must be provided - see the section below. It is straight forward to execute a deployment task - as an example: sudo deploy.sh -b file:///home/jenkins/config -l ericsson-1 -p pod-2 -s os_odl-l2_no-ha -i file:///home/jenkins/MyIso.iso -b and -i arguments should be expressed in URI style. The resources can thus be local or remote. Feedback -------- Please give feed-back before I'm going to far on a wrong tangent Implemented scenarios so far: ----------------------------- - os_ha - os_no-ha - os_odl-l3_ha - os_odl-l3_no-ha - os_odl-l2_ha - os_odl-l2_no-ha - os_onos_ha - os_onos_no-ha - os_kvm_ha - os_kvm_no-ha - os_ovs_ha - os_ovs_no-ha - os_kvm_ovs_ha - os_kvm_ovs_no-ha VERIFIED READY TO MERGE JIRA: FUEL-35 Change-Id: I94a9b477d8ed4ee8057c16d8f20fe543f7ecc20d Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-07Merge "Templates for configuration guide"Jonas Bjurel1-0/+0
2016-01-06Fix noha virtual deployment templates for Erisson bladeFatih Degirmenci20-0/+2484
This change also move the noha templates into new directory structure which is proposed as a separate change with change-id I1ba1f1a7dd3951f4ce403ad2efde6a76130d533e Change-Id: I0bae0c90ae99c8eea1bc43295e727962709ecbe0 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2016-01-05Templates for configuration guideSofia Wallin1-0/+0
Please use the installerconfig.rst to describe the configuration for each installer. Removed configoptions from the patch, we will provide patches for the post install procedures template during the day. Change-Id: If315520f153c60e12e6d188fc5e5ba8c1a5bd865 Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
2016-01-03Update OVS PluginRuijing Guo1-1/+1
1. fix issue in https://gerrit.opnfv.org/gerrit/#/c/5179/ 2. no change for OVS without DPDK 3. add OVS with DPDK packages 4. add DPPD 5. TODO: netvirt + OVS with DPDK Change-Id: I153a95426d388d58933799e183d7b7316062e525 Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2016-01-03upload onosfw plugin makefiledongfeng2-6/+17
Change-Id: I70f81d0ad66d559a672ca037021b4256b18a202d
2015-12-28Added Fuel plug-in builder for OVSNFVJonas Bjurel4-1/+109
JIRA FUEL-36 Change-Id: I354919bbed08dc2a449fa49334ca26d05e057676 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-12-25Merge "Update OVS Plugin"Ruijing Guo0-0/+0
2015-12-24Update OVS PluginRuijing Guo1-1/+1
1. no change for OVS without DPDK 2. add OVS with DPDK packages 3. add DPPD 4. TODO: netvirt + OVS with DPDK Change-Id: I5e1e0c14bea0a2c3284d572cc2ab333486d119d1 Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2015-12-23Update KVM/QEMURuijing Guo1-1/+1
1. fix KVM/QEMU boot issue Change-Id: I967e79e5a8eb6f349ad4feb61fa9701901e2913d Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2015-12-22Merge "Revert "Fix for the default virtaul enviroment template.""Daniel Smith1-3/+3
2015-12-22Revert "Fix for the default virtaul enviroment template."Fatih Degirmenci1-3/+3
We need to revert this in order to be able to run virtual deployments on Intel machine. The issue on Ericsson machine needs to be looked into after the vacation period. This reverts commit 6ffd176509318935eae6dd554a5fb70c255c6db3. Change-Id: Ia0d33bee15f127016c3fda778b4327b5877f79f0
2015-12-22Remove extra controller from Ericsson POD2 DEAFatih Degirmenci1-4/+0
Change-Id: I824e781f24a918fe724f3eb7194005cbf5962b5b Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2015-12-22Fix for the default virtaul enviroment template.lmcdasm1-3/+3
Im not sure who / how this value was changed, but when you are doing a virtual "AUTOMATED" installation, then the value needs to remain as the FUEL VM, since in a nested environment, the idea is NOT to allow the VM's external access (only to the FUEL VM on the ADMIN network )... If you need to have a different "virtualConfiguration", the create a new subdirectory and a alternate configuration rather than the working / default template for CI for FUEL Nested Setup Change-Id: I6163307bac285d710a5a5c683798a3c20c609932 Signed-off-by: lmcdasm <lmcdasm@OPNFV-VNCSRV1.opnfvericsson.ca> JIRA: 007
2015-12-21Move install_docker.sh to common placeRuijing Guo4-29/+2
1. copy install_docker.sh in qemu plugin to docker/ubuntu-builder 2. change docker build in ovs & qemu Change-Id: I3c0143e5e1b10a1cf798592d8bc05a49a5d12d48 Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2015-12-21Align all plugins with new method for cache idStefan K. Berg5-6/+33
The cache tool is now responsible for returning the commit ID of a branch, tag or commit. This change was first introduced in the bgpvpn plugin and now the rest of the plugins with a need for this are also using the same method. Without this, a plugin pointing to a commit ID on master would fail to build once the head of master is updated to point to a later commit... Change-Id: I7c32d5b41871741717ae42c1334e8557f0b0bedd Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-12-21Created a template for installer configurationSofia Wallin1-0/+23
Change-Id: Ia47d104773987f6517eac2a198994d63c9f8122c Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
2015-12-21Rebased with latest upstream ONOSFW pluginJonas Bjurel2-3/+7
Change-Id: Iaa8f101380124aae3c91f75702a89ab784884072 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-12-20Replace ericsson-pod2 dha and dea files with the working versionsFatih Degirmenci2-63/+63
Change-Id: Ia071dd3c76a5d3fc5f8418e39f123850358a00a6 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2015-12-18Uplift of Docker versionsStefan K. Berg3-1/+24
The Docker version 1.5.0 is no longer allowed to acces the Docker remote image repository! Switching to version 1.7.1 instead. Change-Id: Id71cab4b26a02e98a3bb51f31caa394bcf25b7d9 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-12-18Fix for cache handlingStefan K. Berg2-10/+46
Introduced a separate function "getcommitid" in the cache.sh - a.k.a. $(CACHETOOL) - so that given a repo and a tag, branch or commitid the corresponding commitid is returned. The same principle should be used in all caching functions where not a strict tag or head is specified (as git ls-remote will not be able to figure out the commit id in those cases). Change-Id: I3540dca7ab408c872eaabdc68d4058f9d6d7c45f Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-12-17Merge "Updated Installation Instruction for FUEL B-REL WP1 (FUEL 7.0 rebasing)"Jonas Bjurel3-125/+317