x/sahara-ci-config
Code Issues Proposed changes

don't test gate-saharaclient-fake

Browse Source 
the same job is now gating in openstack infrastructure

Change-Id: Ie93cc2b9e5ea4c956632573e076beca122679db6
This commit is contained in:
Vitaly Gridnev 2016-08-30 09:11:30 +03:00
parent 7f084e94ea
commit 98fc15e111
6 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/devstack/local.sh
View File

@ -35,7 +35,6 @@ CENTOS7_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_c7.qcow2
SPARK_1_3_1_IMAGE_PATH=/home/ubuntu/images/spark_1.3.1_u14.qcow2
SPARK_1_6_0_IMAGE_PATH=/home/ubuntu/images/spark_1.6.0_u14.qcow2
MAPR_5_1_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.1.0.mrv2_u14.qcow2
UBUNTU_12_04_IMAGE_PATH=/home/ubuntu/images/ubuntu-12.04-server-cloudimg-amd64-disk1.img
STORM_1_0_1_IMAGE_PATH=/home/ubuntu/images/storm_1.0.1_u14.qcow2
export OS_CLOUD='devstack-admin'
@ -92,9 +91,6 @@ openstack image create $(basename -s .qcow2 $SPARK_1_3_1_IMAGE_PATH) --file $SPA
openstack image create $(basename -s .qcow2 $SPARK_1_6_0_IMAGE_PATH) --file $SPARK_1_6_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_1.6.0'='True' --property '_sahara_username'="ubuntu"
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 $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 create ubuntu-test-image --file $UBUNTU_12_04_IMAGE_PATH --disk-format qcow2 --container-format bare
openstack image create fake_image --file $UBUNTU_12_04_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_fake'='True' --property '_sahara_tag_0.1'='True' --property '_sahara_username'='ubuntu'
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
# rename admin private network

2
config/devstack/localrc
View File

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

1
config/zuul/layout.yaml
View File

@ -121,7 +121,6 @@ projects:
- name: openstack/python-saharaclient
check:
- gate-saharaclient-fake
- gate-sahara-pep8-trunk
- tempest-saharaclient-tests

16
jenkins_job_builder/sahara.yaml
View File

@ -16,21 +16,6 @@
- trigger-cleanup
node: trusty-42 || trusty-43
- job-template:
name: 'gate-saharaclient-fake'
defaults: global
builders:
- gerrit-git-prep
- ci-config-prep
- shell: "FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/sahara-ci-config/slave-scripts/gate-saharaclient.sh"
properties:
- zeromq-event
publishers:
- sahara-logs
- console-log
- trigger-cleanup
node: trusty-42 || trusty-43
- job-template:
name: '{pipeline}-{project_name}-{plugin}-{os}'
defaults: global
@ -199,7 +184,6 @@
- project:
name: saharaclient
jobs:
- 'gate-saharaclient-fake'
- 'tempest-{name}-tests'
- job:

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

@ -86,12 +86,6 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/mapr-5.1.0.mrv2.yaml.mako"
template_image_prefix="mapr_510mrv2"
;;
fake)
mode=distribute
image_name=fake_image
scenario_conf_file="$sahara_templates_path/fake.yaml.mako"
template_image_prefix="fake_plugin"
;;
storm_1.0.1)
scenario_conf_file="$sahara_templates_path/storm-1.0.1.yaml.mako"
template_image_prefix="storm_1_0"

12
slave-scripts/gate-saharaclient.sh
View File

@ -1,12 +0,0 @@
#!/bin/bash -xe
. $FUNCTION_PATH/functions-common.sh
sahara_path="/tmp/sahara"
get_dependency "$sahara_path" "openstack/sahara" "$ZUUL_BRANCH"
cd "$sahara_path"
tox -e venv --notest
.tox/venv/bin/pip install $WORKSPACE
$WORKSPACE/sahara-ci-config/slave-scripts/gate-sahara.sh "$sahara_path"