← Back to branch summary

~alisonken1/openlp/pjlink2-resource-data

« back to all changes in this revision

Viewing changes to scripts/jenkins_script.py

  • Committer: Tim Bentley
  • Author(s): Tomas Groth
  • Date: 2017-05-05 16:27:20 UTC
  • mfrom: (2727.1.6 appveyor-update)
  • Revision ID: tim.bentley@gmail.com-20170505162720-1tvw6h5hev5m4mlk
Integrate the Jenkins setup with the AppVeyor setup, so that Jenkins fails if AppVeyor fails.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/jenkins_script.py
59
59
    Branch_Pull = 'Branch-01-Pull'
60
60
    Branch_Functional = 'Branch-02-Functional-Tests'
61
61
    Branch_Interface = 'Branch-03-Interface-Tests'
62
 
    Branch_Windows_Functional = 'Branch-04a-Windows_Functional_Tests'
63
 
    Branch_Windows_Interface = 'Branch-04b-Windows_Interface_Tests'
64
 
    Branch_PEP = 'Branch-05a-Code_Analysis'
65
 
    Branch_Coverage = 'Branch-05b-Test_Coverage'
66
 
    Branch_Pylint = 'Branch-05c-Code_Analysis2'
 
62
    Branch_PEP = 'Branch-04a-Code_Analysis'
 
63
    Branch_Coverage = 'Branch-04b-Test_Coverage'
 
64
    Branch_Pylint = 'Branch-04c-Code_Analysis2'
 
65
    Branch_AppVeyor = 'Branch-05-AppVeyor-Tests'
67
66
 
68
 
    Jobs = [Branch_Pull, Branch_Functional, Branch_Interface, Branch_Windows_Functional, Branch_Windows_Interface,
69
 
            Branch_PEP, Branch_Coverage, Branch_Pylint]
 
67
    Jobs = [Branch_Pull, Branch_Functional, Branch_Interface, Branch_PEP, Branch_Coverage, Branch_Pylint,
 
68
            Branch_AppVeyor]
70
69
 
71
70
 
72
71
class Colour(object):