diff options
author | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-12-11 10:54:26 +0100 |
---|---|---|
committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-12-11 10:33:41 +0000 |
commit | 4163f6bfb811c17dc22e68c7a2ef1ed30293feaf (patch) | |
tree | 0205ec1ccbf67c0abdd6890a33352046733d33e5 /jjb/opnfv | |
parent | a8f7054c6691852c58c0fd68961a4302c101e20c (diff) |
Cleanup jjb files
- Remove the jobs that do nothing such as merge and daily jobs
- Leave only verify jobs for all the projects as placeholders
- Introduce stable/brahmaputra branch and keep it disabled
Please note that the "real" jobs for bottlenecks, compass4nfv,
functest, and qtip are not deleted.
Change-Id: I80031f77a11c2bf5173fbb7be98294285e3cc2ef
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/opnfv')
-rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 8 | ||||
-rw-r--r-- | jjb/opnfv/pod-params.yml | 17 |
2 files changed, 21 insertions, 4 deletions
diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index 841ce2e3d..6c6b91532 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -8,8 +8,8 @@ project: opnfv-docs jobs: - - 'opnfv-docs-verify' - - 'opnfv-docs-merge' + - 'opnfv-docs-verify-{stream}' + - 'opnfv-docs-merge-{stream}' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) @@ -22,7 +22,7 @@ ######################## - job-template: - name: 'opnfv-docs-verify' + name: 'opnfv-docs-verify-{stream}' parameters: - project-parameter: @@ -63,7 +63,7 @@ - upload-review-docs - job-template: - name: 'opnfv-docs-merge' + name: 'opnfv-docs-merge-{stream}' parameters: - project-parameter: diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml index 3fdf01356..6a2650667 100644 --- a/jjb/opnfv/pod-params.yml +++ b/jjb/opnfv/pod-params.yml @@ -190,6 +190,23 @@ description: 'Git URL to use on the jumphost' - parameter: + name: 'opnfv-build-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-us-build-1 + - ericsson-ca-build-1 + default-slaves: + - intel-us-build-1 + - ericsson-ca-build-1 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on the slave' + +- parameter: name: 'intel-us-build-1-defaults' parameters: - node: |