x/sahara-ci-config
Code Issues Proposed changes

Fix exit code for scripts

Browse Source 
Use more appropriate construction for check exit code
Additionaly use full path for scripts in jobs

Change-Id: I1d8a5fd11c6cf9768f9411343c69525020e0f7c1
This commit is contained in:
Denis Egorenko 2015-03-19 19:42:48 +04:00
parent 1d7ee24898
commit af2dca6b3a
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/sahara-ci-config/slave-scripts/dib.sh vanilla_2.6 {os}
properties:
- zeromq-event

16
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=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/tempest.sh
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/tempest.sh
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/gate-saharaclient.sh
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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=sahara-ci-config/slave-scripts sahara-ci-config/slave-scripts/gate-saharaclient.sh
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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 sahara-ci-config/slave-scripts/gate-sahara.sh
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/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 sahara-ci-config/slave-scripts/gate-sahara.sh
FUNCTION_PATH=$WORKSPACE/sahara-ci-config/slave-scripts $WORKSPACE/sahara-ci-config/slave-scripts/gate-sahara.sh
properties:
- zeromq-event
publishers:
@ -152,7 +152,7 @@
- shell: |
rm -rf sahara-ci-config
git clone https://git.openstack.org/stackforge/sahara-ci-config
bash sahara-ci-config/slave-scripts/integration-cleanup.sh
bash $WORKSPACE/sahara-ci-config/slave-scripts/integration-cleanup.sh
- job:
name: gate-sahara-pep8-trunk
@ -168,7 +168,7 @@
- gerrit-git-prep
- shell: |
git clone https://git.openstack.org/stackforge/sahara-ci-config
sahara-ci-config/slave-scripts/gate-sahara-pep8-trunk.sh
$WORKSPACE/sahara-ci-config/slave-scripts/gate-sahara-pep8-trunk.sh
properties:
- zeromq-event
publishers:

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

@ -150,7 +150,7 @@ run_tests() {
# tox -e scenario $config || failure "Integration tests are failed"
tox -e scenario $config | tee tox.log
STATUS=$(grep "\ -\ Failed" tox.log | awk '{print $3}')
[ "$STATUS" != "0" ] && failure "Integration tests have failed"
if [ "$STATUS" != "0" ]; then failure "Integration tests have failed"; fi
else
tox -e integration -- $plugin --concurrency=$concurrency || failure "Integration tests have failed"
fi

2
slave-scripts/tempest.sh
View File

@ -57,5 +57,5 @@ start_sahara $sahara_conf_path
# tox -e all -- tempest.scenario.data_processing.client_tests || failure "Tempest tests are failed"
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"
if [ "$STATUS" != "0" ]; then failure "Tempest tests have failed"; fi
print_python_env