diff options
| author | Bill Peck <bpeck@redhat.com> | 2015-06-15 11:33:06 -0400 |
|---|---|---|
| committer | Bill Peck <bpeck@redhat.com> | 2015-06-15 11:33:06 -0400 |
| commit | 80cbb1d65bb48dd0b6031108ea0a2e60ff22d263 (patch) | |
| tree | 1ded6d45cae0eebd4d88c54b04940a2720dd4bbf | |
| parent | 198d1eca38fd885e91319198ab615265bf17838e (diff) | |
| download | tests-80cbb1d65bb48dd0b6031108ea0a2e60ff22d263.tar.gz tests-80cbb1d65bb48dd0b6031108ea0a2e60ff22d263.tar.xz tests-80cbb1d65bb48dd0b6031108ea0a2e60ff22d263.zip | |
fix juint report generation. include property file CI_MESSAGE_ENV.txt so that its available in provison job. Add additional variables to jobxml. put exit logic at end of run test script
| -rw-r--r-- | restraint/config/kgtt-restraint.yaml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/restraint/config/kgtt-restraint.yaml b/restraint/config/kgtt-restraint.yaml index 2ab1815..a64a2bd 100644 --- a/restraint/config/kgtt-restraint.yaml +++ b/restraint/config/kgtt-restraint.yaml @@ -117,7 +117,7 @@ failurenew: 0 types: - junit: - pattern: '*.xml' + pattern: '**/xUnit.xml' deleteoutput: false - job-template: @@ -147,6 +147,7 @@ - trigger-parameterized-builds: - project: '{project}-2-provision' current-parameters: true + property-file: $WORKSPACE/CI_MESSAGE_ENV.txt condition: 'SUCCESS' - job-template: @@ -227,6 +228,11 @@ default: ci-ops-projex/config/keys/ci-ops-central description: | Private SSH key to use for authentication + - string: + name: RESTRAINTREPO + default: http://bpeck.fedorapeople.org/restraint/el5.repo + description: | + where do we install restraint from... builders: - copyartifact: project: '{project}-2-provision' @@ -256,6 +262,8 @@ cp $WORKSPACE/tests/restraint/config/${{JOBXMLTEMP}} $WORKSPACE/${{UUID}}_${{JOBXMLTEMP}} export JOBXML=$WORKSPACE/${{UUID}}_${{JOBXMLTEMP}} echo "JOBXML: ${{JOBXML}}" + sed -i "s/##VERSION##/${{version}}/g" ${{JOBXML}} + sed -i "s/##RELEASE##/${{release}}/g" ${{JOBXML}} sed -i "s/##PKGNAME##/${{name}}/g" ${{JOBXML}} sed -i "s|##BASEURL##|${{AUTOBKR_REPO}}|g" ${{JOBXML}} else @@ -270,12 +278,6 @@ #run task runner to execute restraint taskrunner -f $WORKSPACE/ci-ops-central/targets/restraint.py restraint_pipeline rc=$? - if [ $rc -eq 0 ];then - echo "Platform Test Successful : " $rc - else - echo "Platform Test Failed : " $rc - exit $rc - fi echo "=====================================================" echo @@ -284,10 +286,16 @@ # Generate xUnit Results for d in $(find . -type d -iname "${{UUID}}_*") ; do echo "Processing results in $d" - xsltproc /usr/share/restraint/client/job2html.xml $d/job.xml > $d/index.html xsltproc /usr/share/restraint/client/job2junit.xml $d/job.xml > $d/xUnit.xml done + if [ $rc -eq 0 ];then + echo "Platform Test Successful : " $rc + else + echo "Platform Test Failed : " $rc + exit $rc + fi + publishers: - archive: artifacts: '**/**' |