summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml17
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml5
-rw-r--r--jjb/doctor/doctor.yml4
-rw-r--r--jjb/functest/functest-ci-jobs.yml4
-rw-r--r--jjb/infra/bifrost-cleanup-job.yml2
-rw-r--r--jjb/parser/parser.yml6
-rw-r--r--jjb/releng/opnfv-lint.yml2
7 files changed, 32 insertions, 8 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 126651e6c..ac1ef499b 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -599,6 +599,23 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
+ # 1.dovetail only master by now, not sync with A/B/C branches
+ # 2.here the stream means the SUT stream, dovetail stream is defined in its own job
+ # 3.only debug testsuite here(includes basic testcase,
+ # i.e. one tempest smoke ipv6, two vping from functest)
+ # 4.not used for release criteria or compliance,
+ # only to debug the dovetail tool bugs with apex
+ - trigger-builds:
+ - project: 'dovetail-apex-{slave}-debug-{stream}'
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+ block: true
+ same-node: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- trigger-builds:
- project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
predefined-parameters: |
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index d58138088..039b30a69 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -125,6 +125,11 @@
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
+ - name: 'opnfv-yamllint-verify-{stream}'
+ current-parameters: true
+ node-parameters: true
+ kill-phase-on: FAILURE
+ abort-all-job: true
- multijob:
name: deploy-virtual
condition: SUCCESSFUL
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 28888d673..2267a28f7 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -148,8 +148,6 @@
- 'functest-suite-builder'
- shell: |
functest_log="$HOME/opnfv/functest/results/{stream}/{project}.log"
- to_be_archived="$WORKSPACE/tests/functest-{project}.log"
- cp $functest_log $to_be_archived
# NOTE: checking the test result, as the previous job could return
# 0 regardless the result of doctor test scenario.
grep -e ' OK$' $functest_log || exit 1
@@ -157,6 +155,8 @@
publishers:
- archive:
artifacts: 'tests/*.log'
+ - archive:
+ artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log'
#####################################
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 9bf6a1a6e..44c2ce5db 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -114,11 +114,11 @@
installer: fuel
<<: *danube
# daisy CI PODs
- - daisy-baremetal:
+ - baremetal:
slave-label: daisy-baremetal
installer: daisy
<<: *master
- - daisy-virtual:
+ - virtual:
slave-label: daisy-virtual
installer: daisy
<<: *master
diff --git a/jjb/infra/bifrost-cleanup-job.yml b/jjb/infra/bifrost-cleanup-job.yml
index 0ee906f73..f1b38ca4b 100644
--- a/jjb/infra/bifrost-cleanup-job.yml
+++ b/jjb/infra/bifrost-cleanup-job.yml
@@ -133,6 +133,4 @@
file-paths:
- compare-type: ANT
pattern: 'prototypes/bifrost/**'
- - compare-type: ANT
- pattern: 'jjb/infra/**'
readable-message: true
diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 69fcefc20..7f3d6cebe 100644
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -55,7 +55,11 @@
branch-pattern: '**/{branch}'
forbidden-file-paths:
- compare-type: ANT
- pattern: 'docs/**|.gitignore'
+ pattern: 'docs/**'
+ - compare-type: ANT
+ pattern: 'governance/**'
+ - compare-type: ANT
+ pattern: '*.txt|.gitignore|.gitreview|INFO|LICENSE'
builders:
- shell: |
diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index 37cdef28f..166aea8f9 100644
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -102,7 +102,7 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'REG_EXP'
- project-pattern: 'compass4nfv'
+ project-pattern: ''
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'