diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/doctor/doctor.yml | 25 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 65 |
2 files changed, 14 insertions, 76 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 84987028c..2010e1229 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -20,13 +20,9 @@ slave-label: 'ool-virtual1' pod: 'ool-virtual1' - inspector: - - sample - - congress - jobs: - 'doctor-verify-{stream}' - - 'doctor-verify-{installer}-{inspector}-{stream}' + - 'doctor-verify-{installer}-{stream}' - job-template: name: 'doctor-verify-{stream}' @@ -72,7 +68,7 @@ - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh" - job-template: - name: 'doctor-verify-{installer}-{inspector}-{stream}' + name: 'doctor-verify-{installer}-{stream}' node: '{slave-label}' @@ -82,10 +78,6 @@ - gerrit-parameter: branch: '{branch}' - string: - name: INSPECTOR_TYPE - default: '{inspector}' - description: 'Doctor inspector type to be used' - - string: name: OS_CREDS default: /home/jenkins/openstack.creds description: 'OpenStack credentials' @@ -129,7 +121,18 @@ - project: 'functest-{installer}-{pod}-suite-{stream}' current-parameters: true predefined-parameters: | + CI_DEBUG=true + FUNCTEST_SUITE_NAME=doctor + DEPLOY_SCENARIO=os-nosdn-nofeature-ha + TESTCASE_OPTIONS=-e INSPECTOR_TYPE=sample -v $WORKSPACE:$HOME/opnfv/repos/doctor + block: true + same-node: true + - project: 'functest-{installer}-{pod}-suite-{stream}' + current-parameters: true + predefined-parameters: | + CI_DEBUG=true FUNCTEST_SUITE_NAME=doctor - TESTCASE_OPTIONS=-e INSPECTOR_TYPE=$INSPECTOR_TYPE -v $WORKSPACE:$HOME/opnfv/repos/doctor + DEPLOY_SCENARIO=os-nosdn-nofeature-ha + TESTCASE_OPTIONS=-e INSPECTOR_TYPE=congress -v $WORKSPACE:$HOME/opnfv/repos/doctor block: true same-node: true 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: |