x/sahara-ci-config
Code Issues Proposed changes

Fix minor issues

Browse Source 
Fix:
* name for tox.log file;
* remove bash call in jobs;
* create openrc file using tee;
* fix quotes for image registry;
* add image name for dib to itest.conf;

Change-Id: I04ec15920197bc5f050be2300e1db6c2fe1de58d
This commit is contained in:
Denis Egorenko 2015-03-19 17:00:13 +04:00
parent 22275a32f5
commit 1d7ee24898
8 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ export OPENSTACK_HOST=$OPENSTACK_HOST
export HOST=$HOST
export USE_NEUTRON=$USE_NEUTRON
export OS_AUTH_URL=http://$OPENSTACK_HOST:5000/v2.0/
" > /home/jenkins/ci_openrc
" | sudo tee /home/jenkins/ci_openrc
sudo su - jenkins -c "echo '
JENKINS_PUBLIC_KEY' >> /home/jenkins/.ssh/authorized_keys"

12
jenkins_job_builder/diskimage.yaml
View File

@ -6,7 +6,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=sahara-ci-config/slave-scripts ./sahara-ci-config/slave-scripts/dib.sh hdp_2
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/dib.sh hdp_2
properties:
- zeromq-event
@ -25,7 +25,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=sahara-ci-config/slave-scripts ./sahara-ci-config/slave-scripts/dib.sh {plugin} {os}
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/dib.sh {plugin} {os}
properties:
- zeromq-event
@ -44,7 +44,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=sahara-ci-config/slave-scripts ./sahara-ci-config/slave-scripts/dib.sh {plugin}
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/dib.sh {plugin}
properties:
- zeromq-event
@ -63,7 +63,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=sahara-ci-config/slave-scripts ./sahara-ci-config/slave-scripts/dib.sh spark
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/dib.sh spark
properties:
- zeromq-event
@ -82,7 +82,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=sahara-ci-config/slave-scripts ./sahara-ci-config/slave-scripts/dib.sh vanilla_2.4 {os}
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/dib.sh vanilla_2.4 {os}
properties:
- zeromq-event
@ -101,7 +101,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=sahara-ci-config/slave-scripts ./sahara-ci-config/slave-scripts/dib.sh vanilla_2.6 {os}
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/dib.sh vanilla_2.6 {os}
properties:
- zeromq-event

14
jenkins_job_builder/sahara.yaml
View File

@ -6,7 +6,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts bash $WORKSPACE/sahara-ci-config/slave-scripts/tempest.sh
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/tempest.sh
properties:
- zeromq-event
- build-blocker:
@ -26,7 +26,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts bash $WORKSPACE/sahara-ci-config/slave-scripts/tempest.sh
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/tempest.sh
properties:
- zeromq-event
- build-blocker:
@ -45,7 +45,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts bash $WORKSPACE/sahara-ci-config/slave-scripts/gate-saharaclient.sh
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/gate-saharaclient.sh
properties:
- zeromq-event
publishers:
@ -61,7 +61,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts bash $WORKSPACE/sahara-ci-config/slave-scripts/gate-saharaclient.sh
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/gate-saharaclient.sh
properties:
- zeromq-event
publishers:
@ -77,7 +77,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=sahara-ci-config/slave-scripts bash sahara-ci-config/slave-scripts/gate-sahara.sh
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/gate-sahara.sh
properties:
- zeromq-event
publishers:
@ -93,7 +93,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
FUNCTION_PATH=sahara-ci-config/slave-scripts bash sahara-ci-config/slave-scripts/gate-sahara.sh
FUNCTION_PATH=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/gate-sahara.sh
properties:
- zeromq-event
publishers:
@ -168,7 +168,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
bash sahara-ci-config/slave-scripts/gate-sahara-pep8-trunk.sh
sahara-ci-config/slave-scripts/gate-sahara-pep8-trunk.sh
properties:
- zeromq-event
publishers:

8
slave-scripts/dib.sh
View File

@ -53,6 +53,7 @@ case $job_type in
insert_config_value $tests_config_file_template VANILLA SKIP_CINDER_TEST True
insert_config_value $tests_config_file_template VANILLA SKIP_CLUSTER_CONFIG_TEST True
insert_config_value $tests_config_file_template VANILLA SKIP_SCALING_TEST True
insert_config_value $tests_config_file_template VANILLA IMAGE_NAME $vanilla_image
plugin=vanilla1
;;
2.4)
@ -63,6 +64,7 @@ case $job_type in
insert_config_value $tests_config_file_template VANILLA_TWO SKIP_CINDER_TEST True
insert_config_value $tests_config_file_template VANILLA_TWO SKIP_CLUSTER_CONFIG_TEST True
insert_config_value $tests_config_file_template VANILLA_TWO SKIP_SCALING_TEST True
insert_config_value $tests_config_file_template VANILLA_TWO IMAGE_NAME $vanilla_two_four_image
plugin=vanilla2
;;
2.6)
@ -92,6 +94,7 @@ case $job_type in
insert_config_value $tests_config_file_template SPARK SKIP_CINDER_TEST True
insert_config_value $tests_config_file_template SPARK SKIP_CLUSTER_CONFIG_TEST True
insert_config_value $tests_config_file_template SPARK SKIP_SCALING_TEST True
insert_config_value $tests_config_file_template SPARK IMAGE_NAME $spark_image
plugin=spark
fi
insert_config_value $sahara_conf_path DEFAULT plugins spark
@ -104,6 +107,7 @@ case $job_type in
insert_config_value $tests_config_file_template HDP SKIP_CINDER_TEST True
insert_config_value $tests_config_file_template HDP SKIP_CLUSTER_CONFIG_TEST True
insert_config_value $tests_config_file_template HDP SKIP_SCALING_TEST True
insert_config_value $tests_config_file_template HDP IMAGE_NAME $hdp_image
plugin=hdp1
;;
@ -115,6 +119,7 @@ case $job_type in
insert_config_value $tests_config_file_template HDP2 SKIP_CINDER_TEST True
insert_config_value $tests_config_file_template HDP2 SKIP_CLUSTER_CONFIG_TEST True
insert_config_value $tests_config_file_template HDP2 SKIP_SCALING_TEST True
insert_config_value $tests_config_file_template HDP2 IMAGE_NAME $hdp_two_image
plugin=hdp2
;;
@ -131,8 +136,7 @@ case $job_type in
insert_config_value $tests_config_file_template CDH SKIP_CINDER_TEST True
insert_config_value $tests_config_file_template CDH SKIP_CLUSTER_CONFIG_TEST True
insert_config_value $tests_config_file_template CDH SKIP_SCALING_TEST True
insert_config_value $tests_config_file_template CDH CM_REPO_LIST_URL "http://$OPENSTACK_HOST/cdh-repo/cm.list"
insert_config_value $tests_config_file_template CDH CDH_REPO_LIST_URL "http://$OPENSTACK_HOST/cdh-repo/cdh.list"
insert_config_value $tests_config_file_template CDH IMAGE_NAME $cdh_image
plugin=cdh
;;
esac

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

@ -148,7 +148,7 @@ run_tests() {
then
# Temporary use additional log file, due to wrong status code from tox scenario tests
# tox -e scenario $config || failure "Integration tests are failed"
tox -e scenario $config | tee log.txt
tox -e scenario $config | tee tox.log
STATUS=$(grep "\ -\ Failed" tox.log | awk '{print $3}')
[ "$STATUS" != "0" ] && failure "Integration tests have failed"
else

14
slave-scripts/functions-dib.sh
View File

@ -21,25 +21,25 @@ upload_image() {
case "$plugin" in
vanilla-1)
image_properties="--property '_sahara_tag_1.2.1'='True' --property '_sahara_tag_1.1.2'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'=${username}"
image_properties="--property _sahara_tag_1.2.1=True --property _sahara_tag_1.1.2=True --property _sahara_tag_vanilla=True --property _sahara_username=${username}"
;;
vanilla-2.4)
image_properties="--property '_sahara_tag_2.4.1'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'=${username}"
image_properties="--property _sahara_tag_2.4.1=True --property _sahara_tag_vanilla=True --property _sahara_username=${username}"
;;
vanilla-2.6)
image_properties="--property '_sahara_tag_2.6.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'=${username}"
image_properties="--property _sahara_tag_2.6.0=True --property _sahara_tag_vanilla=True --property _sahara_username=${username}"
;;
hdp1)
image_properties="--property '_sahara_tag_1.3.2'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'=${username}"
image_properties="--property _sahara_tag_1.3.2=True --property _sahara_tag_hdp=True --property _sahara_username=${username}"
;;
hdp2)
image_properties="--property '_sahara_tag_2.0.6'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'=${username}"
image_properties="--property _sahara_tag_2.0.6=True --property _sahara_tag_hdp=True --property _sahara_username=${username}"
;;
cdh)
image_properties="--property '_sahara_tag_5.3.0'='True' --property '_sahara_tag_5'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'=${username}"
image_properties="--property _sahara_tag_5.3.0=True --property _sahara_tag_5=True --property _sahara_tag_cdh=True --property _sahara_username=${username}"
;;
spark)
image_properties="--property '_sahara_tag_spark'='True' --property '_sahara_tag_1.0.0'='True' --property '_sahara_username'=${username}"
image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.0.0=True --property _sahara_username=${username}"
;;
esac
register_new_image "$image" "$image_properties"

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

@ -15,4 +15,4 @@ else
.tox/integration/bin/pip install $WORKSPACE
fi
bash -x $WORKSPACE/sahara-ci-config/slave-scripts/gate-sahara.sh /tmp/sahara
$WORKSPACE/sahara-ci-config/slave-scripts/gate-sahara.sh /tmp/sahara

2
slave-scripts/tempest.sh
View File

@ -55,7 +55,7 @@ write_sahara_main_conf $sahara_conf_path "direct"
start_sahara $sahara_conf_path
# Temporary use additional log file, due to wrong status code from tox scenario tests
# tox -e all -- tempest.scenario.data_processing.client_tests || failure "Tempest tests are failed"
tox -e all -- tempest.scenario.data_processing.client_tests | tee log.txt
tox -e all -- tempest.scenario.data_processing.client_tests | tee tox.log
STATUS=$(grep "\ -\ Failed" tox.log | awk '{print $3}')
[ "$STATUS" != "0" ] && failure "Tempest tests have failed"
print_python_env