summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml7
-rw-r--r--jjb/releng-macros.yaml65
2 files changed, 4 insertions, 68 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 056b2cc0f..1c7946a87 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -214,6 +214,10 @@
default: 'os-odl_l2-nofeature-ha'
- fuel-ci-parameter:
gs-pathname: '{gs-pathname}'
+ - string:
+ name: DEPLOY_TIMEOUT
+ default: '150'
+ description: 'Deployment timeout in minutes'
scm:
- git-scm:
@@ -224,9 +228,6 @@
wrappers:
- build-name:
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
- - timeout:
- timeout: 150
- abort: true
builders:
- description-setter:
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 2aa775fd6..d2dc1d1ec 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -49,14 +49,6 @@
choosing-strategy: '{choosing-strategy}'
timeout: 15
-- wrapper:
- name: build-timeout
- wrappers:
- - timeout:
- type: absolute
- timeout: 360
- fail: true
-
- trigger:
name: 'daily-trigger-disabled'
triggers:
@@ -68,11 +60,6 @@
- timed: ''
- trigger:
- name: 'brahmaputra-trigger-daily-enabled'
- triggers:
- - timed: '0 2 * * *'
-
-- trigger:
name: gerrit-trigger-patch-submitted
triggers:
- gerrit:
@@ -117,58 +104,6 @@
fingerprint: true
latest-only: true
-- publisher:
- name: email-notification
- publishers:
- - email-ext:
- recipients: 'jenkins@lists.opnfv.org'
- reply-to:
- content-type: default
- subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'
- body: |
- $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS:
-
- Check console output at $BUILD_URL to view the results.
- unstable: true
- fixed: true
- send-to:
- - developers
- - recipients
-
-- publisher:
- name: jacoco-report
- publishers:
- - jacoco:
- exec-pattern: "**/**.exec"
- class-pattern: "**/classes"
- source-pattern: "**/src/main/java"
- exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**"
- status-update: true
- targets:
- - branch:
- healthy: 10
- unhealthy: 20
- - method:
- healthy: 50
- unhealthy: 40
-
-
-- builder:
- name: test-macro
- builders:
- - shell: 'echo testing macro "test-macro"'
-
-- builder:
- name: wipe-org-opendaylight-repo
- builders:
- - shell: 'if [ -d /tmp/r/org/opendaylight ]; then rm -rf /tmp/r/org/opendaylight; fi'
-
-- builder:
- name: jacoco-nojava-workaround
- builders:
- - shell: 'mkdir -p $WORKSPACE/target/classes'
-
-
# New Releng macros
- builder: