summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-ci-jobs.yml (renamed from jjb/functest/functest.yml)120
-rw-r--r--jjb/functest/functest-project-jobs.yml62
2 files changed, 131 insertions, 51 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest-ci-jobs.yml
index 5aa178bc3..9ae1974a6 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -6,19 +6,83 @@
project: '{name}'
+#--------------------------------
+# BRANCH ANCHORS
+#--------------------------------
+ master: &master
+ stream: master
+ branch: '{stream}'
+ gs-pathname: ''
+ brahmaputra: &brahmaputra
+ stream: brahmaputra
+ branch: 'stable/{stream}'
+ gs-pathname: '{stream}'
+#--------------------------------
+# POD, INSTALLER, AND BRANCH MAPPING
+#--------------------------------
+# Current Mapping
+#--------------------------------
+# everything runs against master branch
+#--------------------------------
pod:
+ - huawei-us-deploy-bare-1:
+ installer: compass
+ <<: *master
+ - intel-pod5:
+ installer: joid
+ <<: *master
- intel-us-deploy-virtual-2:
installer: apex
+ <<: *master
- opnfv-jump-2:
installer: fuel
+ <<: *master
- orange-test1:
installer: fuel
+ <<: *master
- orange-pod2:
installer: joid
- - huawei-us-deploy-bare-1:
- installer: compass
- - intel-pod5:
- installer: joid
+ <<: *master
+#--------------------------------
+# Milestone E Mapping
+# !!!DO NOT ENABLE!!!
+#--------------------------------
+# brahmaputra
+#--------------------------------
+# - huawei-us-deploy-bare-1:
+# installer: compass
+# <<: *brahmaputra
+# - intel-pod5:
+# installer: joid
+# <<: *brahmaputra
+# - opnfv-jump-1:
+# installer: apex
+# <<: *brahmaputra
+# - opnfv-jump-2:
+# installer: fuel
+# <<: *brahmaputra
+#--------------------------------
+# master
+#--------------------------------
+# - ericsson-pod2:
+# installer: fuel
+# <<: *master
+# - intelpod2-jumphost:
+# installer: apex
+# <<: *master
+# - intel-pod6:
+# installer: joid
+# <<: *master
+# - intel-pod8:
+# installer: compass
+# <<: *master
+# - orange-test1:
+# installer: fuel
+# <<: *master
+# - orange-pod2:
+# installer: joid
+# <<: *master
+#--------------------------------
testsuite:
- 'daily'
@@ -26,15 +90,6 @@
jobs:
- 'functest-{installer}-{pod}-{testsuite}-{stream}'
- - 'functest-verify-{stream}'
-
- stream:
- - master:
- branch: 'master'
- gs-pathname: ''
-# - brahmaputra:
-# branch: 'stable/brahmaputra'
-# gs-pathname: '/brahmaputra'
################################
# job template
@@ -44,7 +99,7 @@
wrappers:
- build-name:
- name: '$BUILD_NUMBER: $FUNCTEST_SUITE_NAME $SDN_CONTROLLER $OPNFV_FEATURE'
+ name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE'
parameters:
- project-parameter:
@@ -63,43 +118,6 @@
builders:
- 'functest-{testsuite}-builder'
-- job-template:
- name: 'functest-verify-{stream}'
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
-
- triggers:
- - gerrit:
- trigger-on:
- - patchset-created-event:
- exclude-drafts: 'false'
- exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
- - draft-published-event
- - comment-added-contains-event:
- comment-contains-value: 'recheck'
- - comment-added-contains-event:
- comment-contains-value: 'reverify'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'functest'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
-
- builders:
- - shell: |
- echo "Nothing to verify!"
-
########################
# parameter macros
########################
diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
new file mode 100644
index 000000000..e2a5c1afd
--- /dev/null
+++ b/jjb/functest/functest-project-jobs.yml
@@ -0,0 +1,62 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
+- project:
+ name: functest-project-jobs
+
+ project: 'functest'
+
+ jobs:
+ - 'functest-verify-{stream}'
+
+# only master branch is enabled at the moment to keep no of jobs sane
+ stream:
+ - master:
+ branch: 'master'
+ gs-pathname: ''
+# - brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
+
+- job-template:
+ name: 'functest-verify-{stream}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - 'opnfv-build-defaults'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ triggers:
+ - gerrit:
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
+
+ builders:
+ - shell: |
+ echo "Nothing to verify!"