From 4163f6bfb811c17dc22e68c7a2ef1ed30293feaf Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Fri, 11 Dec 2015 10:54:26 +0100 Subject: 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 --- jjb/pharos/pharos.yml | 160 ++++++++------------------------------------------ 1 file changed, 26 insertions(+), 134 deletions(-) (limited to 'jjb/pharos') diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 92890df1e..2108ccd4d 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -1,73 +1,41 @@ -################################# -# job configuration for pharos -################################# +################################################### +# All the jobs except verify have been removed! +# They will only be enabled on request by projects! +################################################### - project: name: pharos + + project: '{name}' + jobs: - - 'pharos-daily-{stream}' - - 'pharos-merge-{stream}' - 'pharos-verify-{stream}' - - 'pharos-maas-pilot-{stream}' - # stream: branch with - in place of / (eg. stable-arno) - # branch: branch (eg. stable/arno) +# only master branch is enabled at the moment to keep no of jobs sane stream: - master: branch: 'master' gs-pathname: '' - - stable-arno: - branch: 'stable/arno' - gs-pathname: '/arno' - - project: 'pharos' - somevar: 'foo' -############################## -# job template -############################## -- job-template: - name: 'pharos-daily-{stream}' +# - stable-brahmaputra: +# branch: 'stable/brahmaputra' +# gs-pathname: '/brahmaputra' - # Job template for daily builders - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - # branch: branch (eg. stable) - - varsetabove: '{somevar}' +- job_defaults: &pharos_job_defaults + name: pharos_job_defaults parameters: - project-parameter: project: '{project}' - - pharos-parameter: - gs-pathname: '{gs-pathname}' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - triggers: - - 'pharos-{stream}' - - prebuilders: - - test-macro - - builders: - - shell: - !include-raw ../opnfvdocs/docu-build.sh - - postbuilders: - - test-macro + - gerrit-parameter: + branch: '{stream}' - job-template: name: 'pharos-verify-{stream}' + <<: *pharos_job_defaults + parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' + - 'opnfv-build-defaults' + scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -88,90 +56,14 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: 'pharos' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - - builders: - - shell: - !include-raw ../opnfvdocs/docu-build.sh - -- job-template: - name: 'pharos-merge-{stream}' - - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' - - triggers: - - gerrit: - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: 'pharos' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - - builders: - - shell: - !include-raw ../opnfvdocs/docu-build.sh - -- job-template: - name: 'pharos-maas-pilot-{stream}' - - parameters: - - project-parameter: - project: '{project}' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - triggers: - - pollscm: '@midnight' + branch-pattern: '**/{stream}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|.gitignore' builders: - - shell: - echo "Hello World" -######################## -# parameter macros -######################## -- parameter: - name: pharos-parameter - parameters: - - string: - name: GS_PATHNAME - default: '{gs-pathname}' - description: "Version directory where the pharos documents will be stored in gs repository" - -######################## -## trigger macros -######################### -- trigger: - name: 'pharos-master' - triggers: - - pollscm: "H 6 * * *" - -- trigger: - name: 'pharos-stable-arno' - triggers: - - pollscm: "H 18 * * *" + - shell: | + echo "Nothing to verify!" -- cgit 1.2.3-korg