summaryrefslogtreecommitdiffstats
path: root/jjb/octopus
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-11 10:54:26 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-11 10:33:41 +0000
commit4163f6bfb811c17dc22e68c7a2ef1ed30293feaf (patch)
tree0205ec1ccbf67c0abdd6890a33352046733d33e5 /jjb/octopus
parenta8f7054c6691852c58c0fd68961a4302c101e20c (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/octopus')
-rw-r--r--jjb/octopus/octopus.yml142
1 files changed, 22 insertions, 120 deletions
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index ed452a6bb..d61fa1033 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -3,79 +3,38 @@
################################
- project:
name: octopus
+
+ project: '{name}'
+
jobs:
- - 'octopus-test'
- - 'octopus-daily-{stream}'
- - 'octopus-merge-{stream}'
- 'octopus-verify-{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: 'octopus'
- somevar: 'foo'
-###############################
-# job templates
-###############################
-
-- job-template:
- name: octopus-test
-
- builders:
- - shell: |
- echo "Hello world from octopus"
-
-- job-template:
- name: 'octopus-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- varsetabove: '{somevar}'
+- job_defaults: &octopus_job_defaults
+ name: octopus_job_defaults
parameters:
- project-parameter:
project: '{project}'
- - octopus-parameter:
- gs-pathname: '{gs-pathname}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - 'octopus-{stream}'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
name: 'octopus-verify-{stream}'
+ <<: *octopus_job_defaults
+
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -96,71 +55,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'octopus'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
-- job-template:
- name: 'octopus-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: 'octopus'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
-########################
-## parameter macros
-#########################
-- parameter:
- name: octopus-parameter
- parameters:
- - string:
- name: GS_PATHNAME
- default: '{gs-pathname}'
- description: "Version directory where the octopus will be stored in gs repository"
-
-#########################
-## trigger macros
-#########################
-- trigger:
- name: 'octopus-master'
- triggers:
- - pollscm: "H 7 * * *"
-
-- trigger:
- name: 'octopus-stable-arno'
- triggers:
- - pollscm: "H 19 * * *"
+ - shell: |
+ echo "Nothing to verify!"