summaryrefslogtreecommitdiffstats
path: root/ci
AgeCommit message (Collapse)AuthorFilesLines
2017-08-04Merge "Support os-odl-nofeature-* as new scenarios"Alex Yang1-1/+2
2017-08-04Support os-odl-nofeature-* as new scenariosZhijiang Hu1-1/+2
Rename all scenarios with "odl_l3" in their name in Euphrates to just "odl". Daisy will keep "odl_l3" and "odl_l2" (in code, not for user) for further reference. Change-Id: Ib762dd808d4f9467b0e6827b8bbed6d9df7e0e0e Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-03Merge "Eliminate error logs in virtual deployment"Zhijiang Hu1-13/+19
2017-08-02Eliminate error logs in virtual deploymentAlex Yang1-13/+19
There are some error messages in virtual deployment, such as "Domain not found" or "network is already active". The script forgets to destroy the keep-alived network, and should not destroy a non-existent VM or network. Change-Id: I8d9dce9d70f732bd6942b293e407e1845d81fc39 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-02Merge "use template to replace duplicate xml file"Zhijiang Hu1-1/+8
2017-08-01use template to replace duplicate xml filezhouya1-1/+8
Change-Id: I9764612171ef3bf2cdfc652420a2b162fcbfab43 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-01Fix typo in patch 38381Alex Yang1-1/+1
JIRA: DAISY-56 controller01 -> $name Change-Id: Icd959ca55079a6ac0bfbd181ff134d7decfb89f5 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-31Correct the mapping of nodes and roles in virtual deployAlex Yang1-0/+24
JIRA: DAISY-56 Now the roles are assigned to nodes randomly, because the function 'add_hosts_interface' in tempest.py just uses zip to map the host's name to the host. libvirt_utils.py: get mac addresses from VM environment.py: save the mac addresses daisy_server.py: write a new deploy.yml which contains the mac addresses and copy the file to daisy server get_conf.py: get mac addresses from the new deploy.yml tempest.py: assigned roles to nodes when the mac addresses matched controller.xml: increase the RAM to make difference with computer nodes deploy.sh: apply this change to bash script Change-Id: Ia61b60d39d319c5d01e3505727fafc63a0585858 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-31use only one file get_conf.py to get configuration data from deploy.ymlzhouya1-1/+1
just move the code from get_para_from_deploy to get_conf file no functionality change. Change-Id: I86aa1325ff37cb2ae0784c9487e62e95cc23f644 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-07-28Merge "Solve double container removal problem"Zhijiang Hu1-1/+1
2017-07-26Solve double container removal problemZhijiang Hu1-1/+1
From [1], We got an error from docker: "No such container: daisy" while issuing "docker rm -v -f daisy", this OK because we do docker run --rm before this. So it is safe to add "|| true" after "docker rm -v -f daisy". [1] https://build.opnfv.org/ci/job/daisy-build-daily-master/500/console Change-Id: I3d17595156f1b6181a84d9a03e2cd6ddff275eb3 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-26Close upstream merge windowZhijiang Hu1-1/+1
Switch to upstream daisy's stable/ocata branch Change-Id: I5ff0b0a28a8d2f76f0cb813af8f8241175bb6054 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-07Enable HA scenarioszhongjun1-1/+3
Enable HA scenario options due to support HA function in upsteam. Change-Id: Ie1889afc1a149f171a9b324eb284fd650baed397 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-07-07add extra interface to enable the keepablived plane and the api planeroot1-2/+6
Change-Id: I0157bf8b6fa9be254c61bb384065f80107ab3dda Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-03os-nosdn-nofeature-ha as a valid scenarioZhijiang Hu1-1/+1
Project job deployment job uses os-nosdn-nofeature-ha currently, so we need to treat os-nosdn-nofeature-ha as a valid scenario to let the job continue to work. Change-Id: Ib9311ada9b043b1f695f43edb51adbb3714d3356 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-28Add scenario arg checkzhongjun1-1/+22
Add the scenario argument valid check in deploy.sh. Change-Id: Ifeeed3882b22ba379975c2356d761e0536c5c2c9 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-06-24enable opendaylightzhouya1-1/+1
Change-Id: I759d864efa524c0d564b9d93aa480e155149adaa Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-06-08Merge "Set compute to qemu only in virtual deployment"Zhijiang Hu1-1/+1
2017-06-03Merge "Support scenario parameter"Alex Yang1-1/+7
2017-06-02Set compute to qemu only in virtual deploymentZhijiang Hu1-1/+1
Change-Id: I0660c016e18491395c7253e5576f8fa1c8aa051e Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-01Support scenario parameterZhijiang Hu1-1/+7
Default is os-nosdn-nofeature-noha Change-Id: I12e70552c426884269c2c7f1bfa05e1db5658bea Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-05-31Remove iptables rules only in virtual deploymentAlex Yang1-5/+7
There are error messages "iptables: No chain/target/match by that name" in baremetal deployment: https://build.opnfv.org/ci/job/daisy-deploy-daily-master/298/console Change-Id: I7e2940222fd0a99ee42823a08a285bdd93892fe6 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-30modify deploy script to deploy 1 lb and 4computerzhouya1-1/+1
Change-Id: I654a27042ff9807a502773d48df1c26d12302de7 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-05-29bugfix: delete extra firewalls in virtual deploymentSerenaFeng1-0/+6
Change-Id: I179b5aab51958c0cd4653e65bbd74df5cfd7c53e Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-05-27Merge "Create ceph disk in bash script"Alex Yang1-1/+2
2017-05-26add prepare and post process for baremental deploymentSerenaFeng1-8/+5
Change-Id: I3026c4dd83cc19246c19ab568005c4c0b37ff9d9 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-05-26Create ceph disk in bash scriptAlex Yang1-1/+2
Change-Id: Ib80710c784d384ebc27eb0f51fcb4384017eecca Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-23support ocata openstack, keep up with the upstreamAlex Yang1-19/+52
The upstream openstack/daisycloud-core supports ocata openstack now. https://review.openstack.org/#/c/465410/ Change-Id: I14825c80cdd2297e5b0df3680f30fa5c32de3cc4 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-05Merge "Hardcoded physnet1 changed to obtain from .yml"Zhijiang Hu1-1/+0
2017-05-04Increase PACKETS_PER_BUFFER to 65536Zhijiang Hu1-0/+4
1) This mainly increase PACKETS_PER_BUFFER to 65536 to reduce the frequency of TCP client acks. 2) Also kills TCP_BUFF_SIZE and define each buffer size in a more intuitive way. 3) Free more unused memory to prevent being killed by oom-killer after enlarged PACKETS_PER_BUFFER. 4) Increase client's select() timeout to 20 secs, since we encountered timeout due to CPU busy in the same BM but with 20 VMs. Tested this PS in a 10 VM node env, and it can multicast a 2.7G file to 10 VMs in 6 minutes, while unicast needs 30+ minutes. Change-Id: Iaf862fb1f1259cc770f720ccdd95dcc281aef262 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-05-03Hardcoded physnet1 changed to obtain from .ymlzhongjun1-1/+0
the physical network device of external network is hardcode to 'physnet1',change it to obtain from network.yml configuration file. Change-Id: Id2e45ac488619db2247e73cc3fed5706db31d9e9 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-04-26Merge "Print out error message of docker commands"Zhijiang Hu1-2/+2
2017-04-25Print out error message of docker commandsZhijiang Hu1-2/+2
This print out error message of docker commands to find out the reason of error like[1] [1] https://build.opnfv.org/ci/job/daisy-build-daily-master/239/consoleFull Change-Id: Ic1bd85d999dbe584764bc9a05d22579835e55516 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-04-25modify daisy.conf sleep long for trustme modify cpumodezhouya1-1/+4
1.add multicast flag in daisy.conf 2.sleep40 for trustme.sh execute ok 3.modify cpu mode of xml file to make it much more general 4.fix check_openstack_progress parameter error Change-Id: Ic150698ede448b7651e95d129aeb7d97a8f34309 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-04-25Merge "ignore the git history in daisy building job"Zhijiang Hu1-5/+4
2017-04-25ignore the git history in daisy building jobAlex Yang1-5/+4
Now the daisycloud-core is a big repo because there are some big files in the git history. Use "--depth 1" to reduce the amount to download. Change-Id: I8ce0dc6675d2239a126bcf558300f1ad45cd3fb3 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-04-24Unify the kolla config in pyzhongjun1-2/+0
put the kolla nova-compute.conf file update handle to prepare/ execute.py for unify the all relate kolla config in py way. Change-Id: Iac585df97d2855038a83f9bfdadfb9e449660c9c Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-04-15Modify the log message in deploy scriptAlex Yang1-20/+14
1. Move an log message to the correct location(now at line 331). In baremetal deployment, the virtual-deploy message is printed. 2. Modify all the "===" in the log messages to the same number of "=" 3. Remove the TODO list since the work finished Change-Id: I34325c522036caf9d1aa58c9cbf30eb77843fdfc Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-04-15Merge "add the argument WORKDIR in daisy-img-modify.sh"Zhijiang Hu1-6/+2
2017-04-14add the argument WORKDIR in daisy-img-modify.shzhongjun1-6/+2
the daisy install tmp workdir can be configurated as an input argument in deploy.sh,and it also should be used in subshell daisy-img-modify.sh,so add the input argument -w workdir in daisy-img-modify.sh. 1.add an input argument -w workdir in daisy-img-modify.sh. 2.modify the WORKDIR default value to /tmp/workdir/daisy. 3.code refactor to put the centos7.qcow2 file clean statement from the deploy.sh to daisy-img-modify.sh. Change-Id: Id375a15ad2839c209329e644c5e032d044604e7d Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-04-11support mutinode deploy in vm deployment envzhouya1-5/+39
Change-Id: Ic9e19d4e120fc53d96d0794239cd6e421f25ea27 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-04-10code variable name refactorzhongjun1-19/+21
refactor the deploy.sh variable name 1.unify the glabs var name to upper case. 2.refactor the variable of target_node_net/daisy_server_net to add prefix VMDEPLOY for code readablity. 3.refactor the usage() to function usage for uniform the code style. Change-Id: Ibd7ea91ac8b19cd7147e3a7d97b3359880cec59c Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-03-26Fix bug in virtual deployAlex Yang1-1/+1
In prepare_install function of tempest.py: 1. get_config.py needs dha and network parameters 2. install_os_for_vm_step2 function needs cluster_id parameter Change-Id: Idb13f71ced76f0d99dcbe818cdac3d3f2eb7d5df Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-03-23Merge "abolish tag to use branch to get daisy from upstream"Zhijiang Hu1-2/+1
2017-03-23Merge "bugfix hardcoded network configuration"Zhijiang Hu1-1/+3
2017-03-22abolish tag to use branch to get daisy from upstreamzhouya1-2/+1
Change-Id: I3bcc1e6d9cbcb2974fc9246a3b1559f9b988d530 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-21bugfix hardcoded network configurationSerenaFeng1-1/+3
Change-Id: I1fb6036a2805ccb9bdbe23622514ccd9d997c1a5 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-17distinguish virtual and bm deployzhouya1-2/+4
Change-Id: I9fcc4f08283c832d32c22c2195401dd86ecf9dc5 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-03-16unify the definition of NETWORK and NETWORK_CONFSerenaFeng1-9/+2
Change-Id: I1669c92f24739812a4e2d47655b1fc0a1daa3171 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-03-15Merge "add default_floating_pool configuration for nova-api"Zhijiang Hu1-0/+2