diff options
| -rw-r--r-- | jjb/functest/functest.yml | 27 | ||||
| -rw-r--r-- | jjb/octopus/octopus.yml | 26 | ||||
| -rw-r--r-- | jjb/pharos/pharos.yml | 27 |
3 files changed, 51 insertions, 29 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index d2a5bc9ec..f441594c8 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -1,3 +1,6 @@ +################################### +# job configuration for functest +################################### - project: name: functest @@ -11,19 +14,23 @@ - 'functest-odl-test' - 'functest-vims-test' - 'functest-vping-test' - - 'functest-daily-{stream}' + - 'functest-daily-master' - 'functest-merge' - - 'functest-verify' + - 'functest-verify-{stream}' - # stream: branch with - in place of / (eg. stable-helium) - # branch: branch (eg. stable/helium) + # stream: branch with - in place of / (eg. stable-arno) + # branch: branch (eg. stable/arno) stream: - master: branch: 'master' + - stable-arno: + branch: 'stable/arno' project: 'functest' somevar: 'foo' - +################################ +# job template +################################ - job-template: name: functest-openstack-bench-test @@ -138,7 +145,7 @@ - 'functest-all' - job-template: - name: 'functest-daily-{stream}' + name: 'functest-daily-master' node: master @@ -165,7 +172,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: '{branch}' + branch: master wrappers: - ssh-agent-credentials: @@ -185,7 +192,7 @@ - test-macro - job-template: - name: 'functest-verify' + name: 'functest-verify-{stream}' node: master @@ -201,7 +208,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -229,7 +236,7 @@ project-pattern: 'functest' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index db35515c9..b89912c65 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -1,19 +1,27 @@ +################################ +# job configuration for Octopus +################################ - project: name: octopus jobs: - 'octopus-test' - - 'octopus-daily-{stream}' + - 'octopus-daily-master' - 'octopus-merge' - - 'octopus-verify' + - 'octopus-verify-{stream}' - # stream: branch with - in place of / (eg. stable-helium) - # branch: branch (eg. stable/helium) + # stream: branch with - in place of / (eg. stable-arno) + # branch: branch (eg. stable/arno) stream: - master: branch: 'master' + - stable-arno: + branch: 'stable/arno' project: 'octopus' somevar: 'foo' +############################### +# job templates +############################### - job-template: name: octopus-test @@ -31,7 +39,7 @@ echo "Hello world from octopus" - job-template: - name: 'octopus-daily-{stream}' + name: 'octopus-daily-master' node: master @@ -58,7 +66,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: '{branch}' + branch: master wrappers: - ssh-agent-credentials: @@ -78,7 +86,7 @@ - test-macro - job-template: - name: 'octopus-verify' + name: 'octopus-verify-{stream}' node: master @@ -94,7 +102,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -122,7 +130,7 @@ project-pattern: 'octopus' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 89f6a392a..391180b9a 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -1,20 +1,27 @@ +################################# +# job configuration for pharos +################################# - project: name: pharos jobs: - 'pharos-test' - - 'pharos-daily-{stream}' + - 'pharos-daily-master' - 'pharos-merge' - - 'pharos-verify' + - 'pharos-verify-{stream}' - # stream: branch with - in place of / (eg. stable-helium) - # branch: branch (eg. stable/helium) + # stream: branch with - in place of / (eg. stable-arno) + # branch: branch (eg. stable/arno) stream: - master: branch: 'master' + - stable-arno: + branch: 'stable/arno' project: 'pharos' somevar: 'foo' - +############################## +# job template +############################## - job-template: name: pharos-test @@ -31,7 +38,7 @@ echo "Hello world from pharos" - job-template: - name: 'pharos-daily-{stream}' + name: 'pharos-daily-master' node: master @@ -58,7 +65,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: '{branch}' + branch: master wrappers: - ssh-agent-credentials: @@ -78,7 +85,7 @@ - test-macro - job-template: - name: 'pharos-verify' + name: 'pharos-verify-{stream}' node: master @@ -94,7 +101,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -122,7 +129,7 @@ project-pattern: 'pharos' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: |