x/sahara-ci-config
Code Issues Proposed changes

Migrate to heat-engine and neutron

Browse Source 
Migrate all jobs to heat-engine and neutron

Change-Id: I6b7bf1370d630f60d287161b881cc54da5945098
This commit is contained in:
Evgeny Sikachev 2016-04-11 11:13:25 +03:00
parent 4f4eef9c41
commit 5e6190ddd1
13 changed files with 215 additions and 309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
config/devstack/local.sh
View File

@ -15,17 +15,13 @@ GLANCE_CACHE_CONF=/etc/glance/glance-cache.conf
KEYSTONE_CONF=/etc/keystone/keystone.conf
HEAT_CONF=/etc/heat/heat.conf
MYSQL_CONF=/etc/mysql/my.cnf
INTERFACE='br-ex'
source $TOP_DIR/functions-common
if [[ $(openstack --os-cloud=devstack-admin endpoint list | grep -w neutron) != "" ]]; then
USE_NEUTRON=true
if [[ $(hostname -s) =~ 42 ]]; then
HOST_IP='172.18.168.42'
INTERFACE='br-ex'
else
USE_NEUTRON=false
HOST_IP='172.18.168.43'
INTERFACE='br100'
fi
VANILLA_2_6_0_IMAGE_PATH=/home/ubuntu/images/vanilla_2.6.0_u14.qcow2
@ -81,9 +77,7 @@ echo " devstack-ci:
# setup quota for ci tenant
openstack quota set --ram 200000 --instances 64 --cores 150 --volumes 100 --gigabytes 2000 --floating-ips 64 --secgroup-rules 10000 --secgroups 1000 $CI_TENANT_ID
if $USE_NEUTRON; then
neutron quota-update --tenant_id $CI_TENANT_ID --port 64
fi
neutron quota-update --tenant_id $CI_TENANT_ID --port 64
# add images for tests
openstack image create $(basename -s .qcow2 $VANILLA_2_6_0_IMAGE_PATH) --file $VANILLA_2_6_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.6.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu'
@ -103,21 +97,17 @@ openstack image create fake_image --file $UBUNTU_12_04_IMAGE_PATH --disk-format
openstack image set --name ubuntu-12.04 --property '_sahara_tag_ci'='True' ubuntu-12.04-server-cloudimg-amd64-disk1
openstack image set --name ubuntu-14.04 trusty-server-cloudimg-amd64-disk1
if $USE_NEUTRON; then
# rename admin private network
neutron net-update private --name admin-private
# create neutron private network for ci tenant
PRIVATE_NET_ID=$(neutron net-create private | grep -w id | get_field 2)
SUBNET_ID=$(neutron subnet-create --name ci-subnet $PRIVATE_NET_ID $PRIVATE_CIDR | grep -w id | get_field 2)
ROUTER_ID=$(neutron router-create ci-router | grep -w id | get_field 2)
PUBLIC_NET_ID=$(neutron net-list | grep -w public | get_field 1)
FORMAT=" --request-format xml"
neutron router-interface-add $ROUTER_ID $SUBNET_ID
neutron router-gateway-set $ROUTER_ID $PUBLIC_NET_ID
neutron subnet-update ci-subnet --dns_nameservers list=true 8.8.8.8 8.8.4.4
else
PRIVATE_NET_ID=$(nova net-list | grep -w private | get_field 1)
fi
# rename admin private network
neutron net-update private --name admin-private
# create neutron private network for ci tenant
PRIVATE_NET_ID=$(neutron net-create private | grep -w id | get_field 2)
SUBNET_ID=$(neutron subnet-create --name ci-subnet $PRIVATE_NET_ID $PRIVATE_CIDR | grep -w id | get_field 2)
ROUTER_ID=$(neutron router-create ci-router | grep -w id | get_field 2)
PUBLIC_NET_ID=$(neutron net-list | grep -w public | get_field 1)
FORMAT=" --request-format xml"
neutron router-interface-add $ROUTER_ID $SUBNET_ID
neutron router-gateway-set $ROUTER_ID $PUBLIC_NET_ID
neutron subnet-update ci-subnet --dns_nameservers list=true 8.8.8.8 8.8.4.4
# create keypair for UI tests
#nova --os-username ci-user --os-password nova --os-tenant-name ci keypair-add public-jenkins > /dev/null
@ -127,20 +117,15 @@ fi
#sudo sed -i -e "s/default_floating_pool = public/&\nauto_assign_floating_ip = True/g" /etc/nova/nova.conf
# setup security groups
if $USE_NEUTRON; then
#this actions is workaround for bug: https://bugs.launchpad.net/neutron/+bug/1263997
#CI_DEFAULT_SECURITY_GROUP_ID=$(neutron security-group-list --tenant_id $CI_TENANT_ID | grep ' default ' | awk '{print $2}')
CI_DEFAULT_SECURITY_GROUP_ID=$(openstack security group list | grep -w default | get_field 1)
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol icmp --direction ingress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol icmp --direction egress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol tcp --port-range-min 1 --port-range-max 65535 --direction ingress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol tcp --port-range-min 1 --port-range-max 65535 --direction egress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol udp --port-range-min 1 --port-range-max 65535 --direction egress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol udp --port-range-min 1 --port-range-max 65535 --direction ingress $CI_DEFAULT_SECURITY_GROUP_ID
else
nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0
nova secgroup-add-rule default tcp 22 22 0.0.0.0/0
fi
#this actions is workaround for bug: https://bugs.launchpad.net/neutron/+bug/1263997
#CI_DEFAULT_SECURITY_GROUP_ID=$(neutron security-group-list --tenant_id $CI_TENANT_ID | grep ' default ' | awk '{print $2}')
CI_DEFAULT_SECURITY_GROUP_ID=$(openstack security group list | grep -w default | get_field 1)
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol icmp --direction ingress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol icmp --direction egress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol tcp --port-range-min 1 --port-range-max 65535 --direction ingress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol tcp --port-range-min 1 --port-range-max 65535 --direction egress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol udp --port-range-min 1 --port-range-max 65535 --direction egress $CI_DEFAULT_SECURITY_GROUP_ID
neutron security-group-rule-create --tenant_id $CI_TENANT_ID --protocol udp --port-range-min 1 --port-range-max 65535 --direction ingress $CI_DEFAULT_SECURITY_GROUP_ID
#create Sahara endpoint for tests
service_id=$(openstack service create data_processing --name sahara --description "Data Processing Service" | grep -w id | get_field 2)

23
config/devstack/localrc
View File

@ -35,27 +35,20 @@ VOLUME_BACKING_FILE_SIZE=100000M
KEYSTONE_TOKEN_FORMAT=UUID
FIXED_NETWORK_SIZE=256
if [[ $(hostname -s) =~ neutron ]]; then
# Stack-ci lab with neutron network provider
FIXED_RANGE=10.20.0.0/24
NETWORK_GATEWAY=10.20.0.1
if [[ $(hostname -s) =~ 42 ]]; then
FLOATING_RANGE=172.18.169.0/26
PUBLIC_NETWORK_GATEWAY=172.18.169.1
IP_VERSION="4"
# enable neutron and disable nova-net
disable_service n-net
enable_service q-svc q-agt q-dhcp q-l3 q-meta neutron
else
# Stack-sahara lab with nova network provider
FIXED_RANGE=10.1.0.0/24
NETWORK_GATEWAY=10.1.0.1
FLOATING_RANGE=172.16.41.0/26
PUBLIC_NETWORK_GATEWAY=172.16.41.1
# enable nova-net
enable_service n-net
fi
NETWORK_GATEWAY=10.20.0.1
FIXED_RANGE=10.20.0.0/24
IP_VERSION="4"
# enable neutron and disable nova-net
disable_service n-net
enable_service q-svc q-agt q-dhcp q-l3 q-meta neutron
disable_service tempest

16
config/nodepool/sahara.yaml
View File

@ -11,13 +11,13 @@ gearman-servers:
- host: 127.0.0.1
labels:
- name: trusty-neutron
image: trusty-neutron
- name: trusty-42
image: trusty-42
min-ready: 3
providers:
- name: cilab-1
- name: trusty-nova
image: trusty-nova
- name: trusty-43
image: trusty-43
min-ready: 3
providers:
- name: cilab-2
@ -32,9 +32,9 @@ providers:
boot-timeout: 120
pool: public
networks:
- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID'
- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID_42'
images:
- name: trusty-neutron
- name: trusty-42
base-image: 'ubuntu-14.04'
min-ram: 2048
private-key: '/etc/nodepool/id_dsa'
@ -48,9 +48,9 @@ providers:
boot-timeout: 120
pool: public
networks:
- net-id: 'NOVA_NET_LAB_PRIVATE_NETWORK_ID'
- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID_43'
images:
- name: trusty-nova
- name: trusty-43
base-image: 'ubuntu-14.04'
min-ram: 2048
private-key: '/etc/nodepool/id_dsa'

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

@ -70,21 +70,18 @@ sudo git clone https://git.openstack.org/openstack/tempest /home/jenkins/tempest
sudo chown -R jenkins:jenkins /home/jenkins
# create simple openrc file
if [[ "$HOSTNAME" =~ neutron ]]; then
if [[ "$HOSTNAME" =~ trusty-42 ]]; then
OPENSTACK_HOST="172.18.168.42"
HOST="c1"
USE_NEUTRON=true
else
OPENSTACK_HOST="172.18.168.43"
HOST="c2"
USE_NEUTRON=false
fi
echo "export OS_USERNAME=ci-user
export OS_TENANT_NAME=ci
export OS_PASSWORD=nova
export OPENSTACK_HOST=$OPENSTACK_HOST
export HOST=$HOST
export USE_NEUTRON=$USE_NEUTRON
export OS_AUTH_URL=http://$OPENSTACK_HOST:5000/v2.0/
" | sudo tee /home/jenkins/ci_openrc

204
config/zuul/layout.yaml
View File

@ -51,121 +51,121 @@ pipelines:
projects:
- name: openstack/sahara
check:
- gate-sahara-neutron-heat-vanilla_2.6.0-u14
- gate-sahara-neutron-heat-vanilla_2.7.1-u14
- gate-sahara-neutron-direct-spark_1.0.0-u14-aio
- gate-sahara-neutron-direct-spark_1.3.1-u14-aio
- gate-sahara-neutron-direct-spark_1.6.0-u14-aio
- gate-sahara-neutron-heat-transient-u14
- gate-sahara-neutron-heat-mapr_5.0.0.mrv2-u14
- gate-sahara-neutron-heat-mapr_5.1.0.mrv2-u14
- gate-sahara-nova-direct-cdh_5.3.0-u12-aio
- gate-sahara-nova-direct-cdh_5.3.0-c6.6-aio
- gate-sahara-nova-direct-cdh_5.4.0-u12-aio
- gate-sahara-nova-direct-cdh_5.4.0-c6.6-aio
- gate-sahara-nova-direct-cdh_5.5.0-u14-aio
- gate-sahara-nova-direct-cdh_5.5.0-c6.6-aio
- gate-sahara-nova-heat-ambari_2.3-c6.6
- gate-sahara-vanilla_2.6.0-u14
- gate-sahara-vanilla_2.7.1-u14
- gate-sahara-spark_1.0.0-u14-aio
- gate-sahara-spark_1.3.1-u14-aio
- gate-sahara-spark_1.6.0-u14-aio
- gate-sahara-transient-u14
- gate-sahara-mapr_5.0.0.mrv2-u14
- gate-sahara-mapr_5.1.0.mrv2-u14
- gate-sahara-cdh_5.3.0-u12-aio
- gate-sahara-cdh_5.3.0-c6.6-aio
- gate-sahara-cdh_5.4.0-u12-aio
- gate-sahara-cdh_5.4.0-c6.6-aio
- gate-sahara-cdh_5.5.0-u14-aio
- gate-sahara-cdh_5.5.0-c6.6-aio
- gate-sahara-ambari_2.3-c6.6
- gate-sahara-pep8-trunk
- tempest-sahara-tests
- name: openstack/sahara-tests
check:
- gate-sahara_tests-neutron-heat-vanilla_2.6.0-u14
- gate-sahara_tests-neutron-heat-vanilla_2.7.1-u14
- gate-sahara_tests-neutron-direct-spark_1.0.0-u14-aio
- gate-sahara_tests-neutron-direct-spark_1.3.1-u14-aio
- gate-sahara_tests-neutron-direct-spark_1.6.0-u14-aio
- gate-sahara_tests-neutron-heat-transient-u14
- gate-sahara_tests-neutron-heat-mapr_5.0.0.mrv2-u14
- gate-sahara_tests-neutron-heat-mapr_5.1.0.mrv2-u14
- gate-sahara_tests-nova-direct-cdh_5.3.0-u12-aio
- gate-sahara_tests-nova-direct-cdh_5.3.0-c6.6-aio
- gate-sahara_tests-nova-direct-cdh_5.5.0-u14-aio
- gate-sahara_tests-nova-direct-cdh_5.5.0-c6.6-aio
- gate-sahara_tests-nova-heat-ambari_2.3-c6.6
- gate-sahara_tests-nova-direct-cdh_5.4.0-u12-liberty
- gate-sahara_tests-nova-direct-cdh_5.4.0-c6.6-liberty
- gate-sahara_tests-neutron-direct-spark_1.3.1-u14-liberty
- gate-sahara_tests-neutron-heat-vanilla_2.7.1-u14-liberty
- gate-sahara_tests-nova-direct-cdh_5.5.0-u14-mitaka
- gate-sahara_tests-nova-direct-cdh_5.5.0-c6.6-mitaka
- gate-sahara_tests-neutron-heat-mapr_5.0.0.mrv2-u14-mitaka
- gate-sahara_tests-neutron-direct-spark_1.3.1-u14-mitaka
- gate-sahara_tests-neutron-direct-spark_1.6.0-u14-mitaka
- gate-sahara_tests-neutron-heat-vanilla_2.7.1-u14-mitaka
- gate-sahara_tests-nova-heat-ambari_2.3-c6.6-mitaka
- gate-sahara_tests-vanilla_2.6.0-u14
- gate-sahara_tests-vanilla_2.7.1-u14
- gate-sahara_tests-spark_1.0.0-u14-aio
- gate-sahara_tests-spark_1.3.1-u14-aio
- gate-sahara_tests-spark_1.6.0-u14-aio
- gate-sahara_tests-transient-u14
- gate-sahara_tests-mapr_5.0.0.mrv2-u14
- gate-sahara_tests-mapr_5.1.0.mrv2-u14
- gate-sahara_tests-cdh_5.3.0-u12-aio
- gate-sahara_tests-cdh_5.3.0-c6.6-aio
- gate-sahara_tests-cdh_5.5.0-u14-aio
- gate-sahara_tests-cdh_5.5.0-c6.6-aio
- gate-sahara_tests-ambari_2.3-c6.6
- gate-sahara_tests-cdh_5.4.0-u12-liberty
- gate-sahara_tests-cdh_5.4.0-c6.6-liberty
- gate-sahara_tests-spark_1.3.1-u14-liberty
- gate-sahara_tests-vanilla_2.7.1-u14-liberty
- gate-sahara_tests-cdh_5.5.0-u14-mitaka
- gate-sahara_tests-cdh_5.5.0-c6.6-mitaka
- gate-sahara_tests-mapr_5.0.0.mrv2-u14-mitaka
- gate-sahara_tests-spark_1.3.1-u14-mitaka
- gate-sahara_tests-spark_1.6.0-u14-mitaka
- gate-sahara_tests-vanilla_2.7.1-u14-mitaka
- gate-sahara_tests-ambari_2.3-c6.6-mitaka
periodic:
- nightly-sahara_tests-neutron-heat-vanilla_2.6.0-u14
- nightly-sahara_tests-neutron-heat-vanilla_2.7.1-u14
- nightly-sahara_tests-neutron-direct-spark_1.0.0-u14-aio
- nightly-sahara_tests-neutron-direct-spark_1.3.1-u14-aio
- nightly-sahara_tests-neutron-direct-spark_1.6.0-u14-aio
- nightly-sahara_tests-neutron-heat-transient-u14
- nightly-sahara_tests-neutron-heat-mapr_5.0.0.mrv2-u14
- nightly-sahara_tests-nova-direct-cdh_5.3.0-u12-aio
- nightly-sahara_tests-nova-direct-cdh_5.3.0-c6.6-aio
- nightly-sahara_tests-nova-direct-cdh_5.4.0-u12-aio
- nightly-sahara_tests-nova-direct-cdh_5.4.0-c6.6-aio
- nightly-sahara_tests-nova-direct-cdh_5.5.0-u14-aio
- nightly-sahara_tests-nova-direct-cdh_5.5.0-c6.6-aio
- nightly-sahara_tests-nova-heat-ambari_2.3-c6.6
- nightly-sahara_tests-nova-direct-cdh_5.4.0-u12-liberty
- nightly-sahara_tests-nova-direct-cdh_5.4.0-c6.6-liberty
- nightly-sahara_tests-neutron-direct-spark_1.3.1-u14-liberty
- nightly-sahara_tests-neutron-heat-vanilla_2.7.1-u14-liberty
- nightly-sahara_tests-nova-direct-cdh_5.5.0-u14-mitaka
- nightly-sahara_tests-nova-direct-cdh_5.5.0-c6.6-mitaka
- nightly-sahara_tests-neutron-heat-mapr_5.0.0.mrv2-u14-mitaka
- nightly-sahara_tests-neutron-direct-spark_1.3.1-u14-mitaka
- nightly-sahara_tests-neutron-direct-spark_1.6.0-u14-mitaka
- nightly-sahara_tests-neutron-heat-vanilla_2.7.1-u14-mitaka
- nightly-sahara_tests-nova-heat-ambari_2.3-c6.6-mitaka
- nightly-sahara_tests-vanilla_2.6.0-u14
- nightly-sahara_tests-vanilla_2.7.1-u14
- nightly-sahara_tests-spark_1.0.0-u14-aio
- nightly-sahara_tests-spark_1.3.1-u14-aio
- nightly-sahara_tests-spark_1.6.0-u14-aio
- nightly-sahara_tests-transient-u14
- nightly-sahara_tests-mapr_5.0.0.mrv2-u14
- nightly-sahara_tests-cdh_5.3.0-u12-aio
- nightly-sahara_tests-cdh_5.3.0-c6.6-aio
- nightly-sahara_tests-cdh_5.4.0-u12-aio
- nightly-sahara_tests-cdh_5.4.0-c6.6-aio
- nightly-sahara_tests-cdh_5.5.0-u14-aio
- nightly-sahara_tests-cdh_5.5.0-c6.6-aio
- nightly-sahara_tests-ambari_2.3-c6.6
- nightly-sahara_tests-cdh_5.4.0-u12-liberty
- nightly-sahara_tests-cdh_5.4.0-c6.6-liberty
- nightly-sahara_tests-spark_1.3.1-u14-liberty
- nightly-sahara_tests-vanilla_2.7.1-u14-liberty
- nightly-sahara_tests-cdh_5.5.0-u14-mitaka
- nightly-sahara_tests-cdh_5.5.0-c6.6-mitaka
- nightly-sahara_tests-mapr_5.0.0.mrv2-u14-mitaka
- nightly-sahara_tests-spark_1.3.1-u14-mitaka
- nightly-sahara_tests-spark_1.6.0-u14-mitaka
- nightly-sahara_tests-vanilla_2.7.1-u14-mitaka
- nightly-sahara_tests-ambari_2.3-c6.6-mitaka
- name: openstack/python-saharaclient
check:
- gate-saharaclient-distributed-heat-fake
- gate-saharaclient-distributed-fake
- gate-sahara-pep8-trunk
- tempest-saharaclient-tests
- name: openstack/sahara-image-elements
check:
- dib-neutron-heat-vanilla_2.6.0-u14
- dib-neutron-heat-vanilla_2.6.0-c6.6
- dib-neutron-heat-vanilla_2.7.1-u14
- dib-neutron-heat-vanilla_2.7.1-c6.6
- dib-neutron-heat-vanilla_2.7.1-c7
- dib-neutron-heat-mapr_5.0.0.mrv2-u14
- dib-neutron-heat-mapr_5.1.0.mrv2-u14
- dib-neutron-direct-spark_1.0.0-u14-aio
- dib-neutron-direct-spark_1.3.1-u14-aio
- dib-neutron-direct-spark_1.6.0-u14-aio
- dib-nova-heat-ambari_2.1-c6.6
- dib-nova-direct-cdh_5.3.0-u12-aio
- dib-nova-direct-cdh_5.3.0-c6.6-aio
- dib-nova-direct-cdh_5.4.0-u12-aio
- dib-nova-direct-cdh_5.4.0-c6.6-aio
- dib-nova-direct-cdh_5.5.0-u14-aio
- dib-nova-direct-cdh_5.5.0-c6.6-aio
- dib-vanilla_2.6.0-u14
- dib-vanilla_2.6.0-c6.6
- dib-vanilla_2.7.1-u14
- dib-vanilla_2.7.1-c6.6
- dib-vanilla_2.7.1-c7
- dib-mapr_5.0.0.mrv2-u14
- dib-mapr_5.1.0.mrv2-u14
- dib-spark_1.0.0-u14-aio
- dib-spark_1.3.1-u14-aio
- dib-spark_1.6.0-u14-aio
- dib-ambari_2.1-c6.6
- dib-cdh_5.3.0-u12-aio
- dib-cdh_5.3.0-c6.6-aio
- dib-cdh_5.4.0-u12-aio
- dib-cdh_5.4.0-c6.6-aio
- dib-cdh_5.5.0-u14-aio
- dib-cdh_5.5.0-c6.6-aio
post:
- dib-neutron-heat-vanilla_2.6.0-u14
- dib-neutron-heat-vanilla_2.6.0-c6.6
- dib-neutron-heat-vanilla_2.7.1-u14
- dib-neutron-heat-vanilla_2.7.1-c6.6
- dib-neutron-heat-vanilla_2.7.1-c7
- dib-neutron-heat-mapr_5.0.0.mrv2-u14
- dib-neutron-heat-mapr_5.1.0.mrv2-u14
- dib-neutron-direct-spark_1.0.0-u14-aio
- dib-neutron-direct-spark_1.3.1-u14-aio
- dib-neutron-direct-spark_1.6.0-u14-aio
- dib-nova-heat-ambari_2.1-c6.6
- dib-nova-direct-cdh_5.3.0-u12-aio
- dib-nova-direct-cdh_5.3.0-c6.6-aio
- dib-nova-direct-cdh_5.4.0-u12-aio
- dib-nova-direct-cdh_5.4.0-c6.6-aio
- dib-nova-direct-cdh_5.5.0-u14-aio
- dib-nova-direct-cdh_5.5.0-c6.6-aio
- dib-vanilla_2.6.0-u14
- dib-vanilla_2.6.0-c6.6
- dib-vanilla_2.7.1-u14
- dib-vanilla_2.7.1-c6.6
- dib-vanilla_2.7.1-c7
- dib-mapr_5.0.0.mrv2-u14
- dib-mapr_5.1.0.mrv2-u14
- dib-spark_1.0.0-u14-aio
- dib-spark_1.3.1-u14-aio
- dib-spark_1.6.0-u14-aio
- dib-ambari_2.1-c6.6
- dib-cdh_5.3.0-u12-aio
- dib-cdh_5.3.0-c6.6-aio
- dib-cdh_5.4.0-u12-aio
- dib-cdh_5.4.0-c6.6-aio
- dib-cdh_5.5.0-u14-aio
- dib-cdh_5.5.0-c6.6-aio
- name: openstack/sahara-ci-config
check:
@ -246,7 +246,7 @@ jobs:
- ^sahara_tests/scenario/defaults/mitaka/vanilla-2.7.1.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- name: dib-neutron-heat-vanilla_2.7.1-c6.6
- name: dib-vanilla_2.7.1-c6.6
voting: false
- name: ^.*-ambari_2.3-.*$
branch: ^(master|stable/mitaka)$
@ -255,7 +255,7 @@ jobs:
- ^sahara_tests/scenario/defaults/mitaka/ambari-2.3.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- name: dib-neutron-heat-vanilla_2.7.1-c7
- name: dib-vanilla_2.7.1-c7
branch: ^(master|stable/mitaka)$
voting: false
- name: ^(?!nightly).*-vanilla_2.6.0-.*$
@ -267,7 +267,7 @@ jobs:
- name: gate-sahara-pep8-trunk
branch: ^(master|stable/kilo|stable/liberty|stable/mitaka)$
voting: false
- name: ^(?!nightly).*-nova-heat-ambari_2.1-.*$
- name: ^(?!nightly).*-ambari_2.1-.*$
branch: ^(master|stable/mitaka)$
files:
- ^sahara_tests/scenario/defaults/ambari-2.1.*$

30
jenkins_job_builder/diskimage.yaml
View File

@ -1,5 +1,5 @@
- job-template:
name: 'dib-{network}-{engine}-{plugin}-{os}-aio'
name: 'dib-{plugin}-{os}-aio'
defaults: global
builders:
- gerrit-git-prep
@ -11,10 +11,10 @@
- sahara-logs
- console-log
- trigger-cleanup
node: 'trusty-{network}'
node: trusty-42 || trusty-43
- job-template:
name: 'dib-{network}-{engine}-{plugin}-{os}'
name: 'dib-{plugin}-{os}'
defaults: global
builders:
- gerrit-git-prep
@ -26,13 +26,11 @@
- sahara-logs
- console-log
- trigger-cleanup
node: 'trusty-{network}'
node: trusty-42 || trusty-43
- project:
name: sahara-image-elements
github-org: openstack
network: neutron
engine: heat
plugin: vanilla_2.7.1
os:
- u14
@ -40,43 +38,37 @@
- c7
jobs:
- 'dib-{network}-{engine}-{plugin}-{os}'
- 'dib-{network}-{engine}-{plugin}-{os}-aio':
network: nova
engine: direct
- 'dib-{plugin}-{os}'
- 'dib-{plugin}-{os}-aio':
plugin:
- cdh_5.3.0
- cdh_5.4.0
os:
- u12
- c6.6
- 'dib-{network}-{engine}-{plugin}-{os}-aio':
network: nova
engine: direct
- 'dib-{plugin}-{os}-aio':
plugin:
- cdh_5.5.0
os:
- u14
- c6.6
- 'dib-{network}-{engine}-{plugin}-{os}-aio':
engine: direct
- 'dib-{plugin}-{os}-aio':
plugin:
- spark_1.0.0
- spark_1.3.1
- spark_1.6.0
os: u14
- 'dib-{network}-{engine}-{plugin}-{os}':
- 'dib-{plugin}-{os}':
plugin:
- mapr_5.0.0.mrv2
- mapr_5.1.0.mrv2
os: u14
- 'dib-{network}-{engine}-{plugin}-{os}':
network: nova
- 'dib-{plugin}-{os}':
plugin:
- ambari_2.1
os:
- c6.6
- 'dib-{network}-{engine}-{plugin}-{os}':
- 'dib-{plugin}-{os}':
plugin: vanilla_2.6.0
os:
- u14

126
jenkins_job_builder/sahara.yaml
View File

@ -14,10 +14,10 @@
- sahara-logs
- console-log
- trigger-cleanup
node: trusty-neutron || trusty-nova
node: trusty-42 || trusty-43
- job-template:
name: 'gate-saharaclient-distributed-heat-fake'
name: 'gate-saharaclient-distributed-fake'
defaults: global
builders:
- gerrit-git-prep
@ -29,10 +29,10 @@
- sahara-logs
- console-log
- trigger-cleanup
node: trusty-neutron || trusty-nova
node: trusty-42 || trusty-43
- job-template:
name: '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}'
name: '{pipeline}-{project_name}-{plugin}-{os}'
defaults: global
builders:
- gerrit-git-prep
@ -44,10 +44,10 @@
- sahara-logs
- console-log
- trigger-cleanup
node: 'trusty-{network}'
node: trusty-42 || trusty-43
- job-template:
name: '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}-aio'
name: '{pipeline}-{project_name}-{plugin}-{os}-aio'
defaults: global
builders:
- gerrit-git-prep
@ -59,10 +59,10 @@
- sahara-logs
- console-log
- trigger-cleanup
node: 'trusty-{network}'
node: trusty-42 || trusty-43
- job-template:
name: '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}'
name: '{pipeline}-sahara_tests-{plugin}-{os}-{release}'
defaults: global
builders:
- gerrit-git-prep
@ -74,7 +74,7 @@
- sahara-logs
- console-log
- trigger-cleanup
node: 'trusty-{network}'
node: trusty-42 || trusty-43
- project:
name: sahara
@ -83,8 +83,6 @@
project_name:
- sahara
- sahara_tests
network: nova
engine: direct
plugin:
- cdh_5.3.0
- cdh_5.4.0
@ -92,9 +90,8 @@
- u12
- c6.6
jobs:
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}-aio'
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}':
engine: heat
- '{pipeline}-{project_name}-{plugin}-{os}-aio'
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
- vanilla_2.6.0
- vanilla_2.7.1
@ -102,66 +99,49 @@
- mapr_5.0.0.mrv2
- mapr_5.1.0.mrv2
os: u14
network: neutron
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}-aio':
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:
- cdh_5.5.0
os: u14
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}-aio':
os:
- u14
- c6.6
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:
- spark_1.0.0
- spark_1.3.1
- spark_1.6.0
os: u14
network: neutron
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}':
network: nova
engine: heat
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
- ambari_2.3
os: c6.6
- 'tempest-{name}-tests'
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- cdh_5.4.0
release: liberty
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
network: neutron
engine: heat
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- vanilla_2.7.1
os: u14
release:
- liberty
- mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
network: neutron
plugin:
- spark_1.3.1
os: u14
release:
- liberty
- mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- cdh_5.5.0
os: u14
os:
- u14
- c6.6
release: mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
network: neutron
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- spark_1.6.0
os: u14
release: mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
network: neutron
engine: heat
plugin:
- mapr_5.0.0.mrv2
os: u14
release: mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
engine: heat
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- ambari_2.3
os: c6.6
@ -173,8 +153,6 @@
- nightly
project_name:
- sahara_tests
network: nova
engine: direct
plugin:
- cdh_5.3.0
- cdh_5.4.0
@ -182,9 +160,8 @@
- u12
- c6.6
jobs:
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}-aio'
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}':
engine: heat
- '{pipeline}-{project_name}-{plugin}-{os}-aio'
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
- vanilla_2.6.0
- vanilla_2.7.1
@ -192,65 +169,48 @@
- mapr_5.0.0.mrv2
- mapr_5.1.0.mrv2
os: u14
network: neutron
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}-aio':
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:
- spark_1.0.0
- spark_1.3.1
- spark_1.6.0
os: u14
network: neutron
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}-aio':
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:
- cdh_5.5.0
os: u14
- '{pipeline}-{project_name}-{network}-{engine}-{plugin}-{os}':
network: nova
engine: heat
os:
- u14
- c6.6
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
- ambari_2.3
os: c6.6
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- cdh_5.4.0
release: liberty
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
network: neutron
engine: heat
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- vanilla_2.7.1
os: u14
release:
- liberty
- mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
network: neutron
plugin:
- spark_1.3.1
os: u14
release:
- liberty
- mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- cdh_5.5.0
os: u14
os:
- u14
- c6.6
release: mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
network: neutron
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- spark_1.6.0
os: u14
release: mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
network: neutron
engine: heat
plugin:
- mapr_5.0.0.mrv2
os: u14
release: mitaka
- '{pipeline}-sahara_tests-{network}-{engine}-{plugin}-{os}-{release}':
engine: heat
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- ambari_2.3
os: c6.6
@ -259,7 +219,7 @@
- project:
name: saharaclient
jobs:
- 'gate-saharaclient-distributed-heat-fake'
- 'gate-saharaclient-distributed-fake'
- 'tempest-{name}-tests'
- job:
@ -270,7 +230,7 @@
\n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/openstack/sahara-ci-config\">https://git.openstack.org/openstack/sahara-ci-config</a></b>\
\n<p>This job runs pep8 check using trunk version of hacking"
disabled: false
node: trusty-neutron || trusty-nova
node: trusty-42 || trusty-43
builders:
- gerrit-git-prep
- ci-config-prep

4
slave-scripts/dib.sh
View File

@ -15,8 +15,6 @@ sahara_conf_file="$SAHARA_PATH/etc/sahara/sahara.conf"
sahara_templates_path=$SAHARA_TESTS_PATH/sahara_tests/scenario/defaults
tests_etc=$sahara_templates_path
engine=$(echo $JOB_NAME | awk -F '-' '{ print $3 }')
plugin="$1"
os="$2"
image_name=${HOST}_${plugin}_${os}_${ZUUL_CHANGE}
@ -148,7 +146,7 @@ esac
cd $SAHARA_PATH
sudo pip install . --no-cache-dir
enable_pypi
write_sahara_main_conf "$sahara_conf_file" "$engine" "$sahara_plugin"
write_sahara_main_conf "$sahara_conf_file" "$sahara_plugin"
write_tests_conf "$cluster_name" "$template_image_prefix" "$image_name" "$scenario_conf_file" # support kilo
start_sahara "$sahara_conf_file" "$mode" && run_tests "$scenario_conf_file"
print_python_env

13
slave-scripts/functions-common.sh
View File

@ -157,12 +157,11 @@ start_sahara() {
write_sahara_main_conf() {
local conf_path=$1
local engine=$2
local plugin=$3
insert_config_value $conf_path DEFAULT infrastructure_engine $engine
local plugin=$2
insert_config_value $conf_path DEFAULT infrastructure_engine heat
insert_config_value $conf_path DEFAULT api_workers 4
insert_config_value $conf_path DEFAULT use_identity_api_v3 true
insert_config_value $conf_path DEFAULT use_neutron $USE_NEUTRON
insert_config_value $conf_path DEFAULT use_neutron true
insert_config_value $conf_path DEFAULT min_transient_cluster_active_time 30
insert_config_value $conf_path DEFAULT node_domain ci
insert_config_value $conf_path DEFAULT plugins $plugin
@ -182,11 +181,7 @@ write_tests_conf() {
local cluster_name=$1
local image_prefix=$2
local image_name=$3
if [ "$USE_NEUTRON" == "true" ]; then
NETWORK="neutron"
else
NETWORK="nova-network"
fi
NETWORK="neutron"
echo "[DEFAULT]
OS_USERNAME: $OS_USERNAME
OS_PASSWORD: $OS_PASSWORD

5
slave-scripts/gate-sahara.sh
View File

@ -19,7 +19,6 @@ if [ "$ZUUL_PROJECT" != "openstack/sahara-tests" ]; then
get_dependency "$SAHARA_TESTS_PATH" "openstack/sahara-tests" "master"
fi
engine_type=$(echo $JOB_NAME | awk -F '-' '{ print $4 }')
plugin=$(echo $JOB_NAME | awk -F '-' '{ print $5 }')
os=$(echo $JOB_NAME | awk -F '-' '{ print $6 }')
image_name=${plugin}_${os}
@ -61,7 +60,7 @@ case $plugin in
image_name=vanilla_2.6.0_u14
else
image_name=vanilla_2.7.1_u14
fi
fi
template_image_prefix="vanilla_two_seven_one"
sahara_plugin=vanilla
concurrency=3
@ -112,7 +111,7 @@ esac
sudo pip install -r requirements.txt . --no-cache-dir
enable_pypi
write_sahara_main_conf "$sahara_conf_file" "$engine_type" "$sahara_plugin"
write_sahara_main_conf "$sahara_conf_file" "$sahara_plugin"
write_tests_conf "$cluster_name" "$template_image_prefix" "$image_name" "$scenario_conf_file" # support kilo
start_sahara "$sahara_conf_file" "$mode" && run_tests "$scenario_conf_file" "$concurrency"
print_python_env

23
slave-scripts/integration-cleanup.sh
View File

@ -9,13 +9,13 @@ job_type=$(echo $PREV_JOB | awk -F '-' '{ print $1 }')
export os_username=$os_username
export os_password=$os_password
export os_tenant_name=$os_tenant_name
if [[ "$HOST_NAME" =~ neutron ]]; then
export os_auth_url="http://$OPENSTACK_HOST_NEUTRON_LAB:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_HOST_NEUTRON_LAB:8004/v1/$NEUTRON_LAB_TENANT_ID"
if [[ "$HOST_NAME" =~ 42 ]]; then
export os_auth_url="http://$OPENSTACK_HOST_42_LAB:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_42_NEUTRON_LAB:8004/v1/$LAB_42_TENANT_ID"
host="c1"
else
export os_auth_url="http://$OPENSTACK_HOST_NOVA_NET_LAB:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_HOST_NOVA_NET_LAB:8004/v1/$NOVA_NET_LAB_TENANT_ID"
export os_auth_url="http://$OPENSTACK_HOST_43_LAB:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_HOST_43_LAB:8004/v1/$LAB_43_TENANT_ID"
host="c2"
fi
if [[ $(echo $PREV_JOB | awk -F '-' '{ print $2 }') =~ ui ]]; then
@ -23,16 +23,5 @@ if [[ $(echo $PREV_JOB | awk -F '-' '{ print $2 }') =~ ui ]]; then
elif [ "$job_type" == "tempest" ]; then
python cleanup.py cleanup .*sahara-cluster.*
else
if [ "$job_type" == "dib" ]; then
engine=$(echo $PREV_JOB | awk -F '-' '{ print $3 }')
else
engine=$(echo $PREV_JOB | awk -F '-' '{ print $4 }')
fi
if [ "$engine" == "heat" ]
then
python cleanup.py cleanup-heat .*$host-$CHANGE_NUMBER-$CLUSTER_HASH.*
else
python cleanup.py cleanup .*$host-$CHANGE_NUMBER-$CLUSTER_HASH.*
fi
python cleanup.py cleanup-heat .*$host-$CHANGE_NUMBER-$CLUSTER_HASH.*
fi

10
slave-scripts/tempest.sh
View File

@ -47,13 +47,11 @@ insert_config_value etc/tempest.conf identity tenant_name $OS_TENANT_NAME
insert_config_value etc/tempest.conf identity username $OS_USERNAME
insert_config_value etc/tempest.conf identity uri "http://$OPENSTACK_HOST:5000/v2.0/"
insert_config_value etc/tempest.conf identity uri_v3 "http://$OPENSTACK_HOST:5000/v3/"
insert_config_value etc/tempest.conf service_available neutron $USE_NEUTRON
insert_config_value etc/tempest.conf service_available neutron true
insert_config_value etc/tempest.conf service_available sahara true
if [ "$USE_NEUTRON" == "true" ]; then
public_network_id=$(neutron net-show "public" -f value -c id)
insert_config_value etc/tempest.conf network public_network_id $public_network_id
fi
insert_config_value etc/tempest.conf data-processing-feature-enabled plugins "fake,vanilla"
public_network_id=$(neutron net-show "public" -f value -c id)
insert_config_value etc/tempest.conf network public_network_id $public_network_id
if [ "$TEMPESTPLUGIN_TESTS" == "0" ]; then
# create tests file
@ -72,7 +70,7 @@ fi
enable_pypi
sudo pip install $SAHARA_PATH/. --no-cache-dir
write_sahara_main_conf $sahara_conf_path "direct" "fake,vanilla"
write_sahara_main_conf $sahara_conf_path "fake,vanilla"
start_sahara $sahara_conf_path
# Prepare env and install saharaclient

4
slave-scripts/update_config.sh
View File

@ -9,8 +9,8 @@ sudo su - zuul -c "cat $WORKSPACE/config/zuul/logging.conf > /etc/zuul/logging.c
sudo su - zuul -c "cat $WORKSPACE/config/zuul/openstack_functions.py > /etc/zuul/openstack_functions.py"
sudo service zuul reload
sed "s%- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID'%- net-id: '$NEUTRON_LAB_PRIVATE_NETWORK_ID'%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%- net-id: 'NOVA_NET_LAB_PRIVATE_NETWORK_ID'%- net-id: '$NOVA_NET_LAB_PRIVATE_NETWORK_ID'%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID_42'%- net-id: '$NEUTRON_LAB_PRIVATE_NETWORK_ID_42'%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%- net-id: 'NEUTRON_LAB_PRIVATE_NETWORK_ID_43'%- net-id: '$NOVA_NET_LAB_PRIVATE_NETWORK_ID_43'%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%apikey: JENKINS_API_KEY%apikey: $JENKINS_API_KEY%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sed "s%credentials-id: CREDENTIALS_ID%credentials-id: $CREDENTIALS_ID%g" -i $WORKSPACE/config/nodepool/sahara.yaml
sudo su - nodepool -c "cat $WORKSPACE/config/nodepool/sahara.yaml > /etc/nodepool/nodepool.yaml"