x
/
sahara-ci-config
Code Issues Proposed changes

Move ci-slaves to ubuntu 16.04 

Change image names in nodepool config to ubuntu_16.04

Change-Id: Ia2836f800a53dbbfb5916343cd058c87560c3125
This commit is contained in:
Alina Nesterova 2016-11-21 16:21:09 +03:00
parent 9530bcc6a6
commit ed166be380
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/devstack/local.sh
View File

@ -93,7 +93,7 @@ openstack image create $(basename -s .qcow2 $SPARK_1_6_0_IMAGE_PATH) --file $SPA
openstack image create $(basename -s .qcow2 $MAPR_5_1_0_MRV2_IMAGE_PATH) --file $MAPR_5_1_0_MRV2_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_mapr'='True' --property '_sahara_tag_5.1.0.mrv2'='True' --property '_sahara_username'="ubuntu"
openstack image create $(basename -s .qcow2 $MAPR_5_2_0_MRV2_IMAGE_PATH) --file $MAPR_5_2_0_MRV2_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_mapr'='True' --property '_sahara_tag_5.2.0.mrv2'='True' --property '_sahara_username'="ubuntu"
openstack image create $(basename -s .qcow2 $STORM_1_0_1_IMAGE_PATH) --file $STORM_1_0_1_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_storm'='True' --property '_sahara_tag_1.0.1'='True' --property '_sahara_username'="ubuntu"
openstack image set --name ubuntu-14.04 trusty-server-cloudimg-amd64-disk1
openstack image set --name ubuntu-16.04 xenial-server-cloudimg-amd64-disk1
# rename admin private network
neutron net-update private --name admin-private

2
config/devstack/localrc
View File

@ -55,4 +55,4 @@ disable_service tempest
# Enable logging
#SCREEN_LOGDIR=/var/log/devstack
IMAGE_URLS=https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
IMAGE_URLS=https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img

4
config/nodepool/config/sahara.yaml
View File

@ -36,7 +36,7 @@ providers:
- net-id: 'LAB_42_PRIVATE_NETWORK_ID'
images:
- name: stack-42
base-image: 'ubuntu-14.04'
base-image: 'ubuntu-16.04'
min-ram: 2048
private-key: '/etc/nodepool/id_dsa'
setup: prepare_node.sh
@ -53,7 +53,7 @@ providers:
- net-id: 'LAB_43_PRIVATE_NETWORK_ID'
images:
- name: stack-43
base-image: 'ubuntu-14.04'
base-image: 'ubuntu-16.04'
min-ram: 2048
private-key: '/etc/nodepool/id_dsa'
setup: prepare_node.sh

2
config/nodepool/scripts/prepare_node.sh
View File

@ -23,7 +23,7 @@ sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" -o DPkg::Options::="--force-confold" upgrade -y
# APT_PACKAGES variable using for installing packages via apt-get
# PIP_PACKAGES variable using for installing packages via pip
APT_PACKAGES="git python-dev gcc make openjdk-7-jre-headless python-pip mysql-server libpq-dev libmysqlclient-dev"
APT_PACKAGES="git python-dev gcc make openjdk-8-jre-headless python-pip mysql-server libpq-dev libmysqlclient-dev"
# RabbitMQ for distributed Sahara mode
APT_PACKAGES+=" rabbitmq-server"
# Required libraries