summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2017-12-11 20:15:19 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-11 20:15:19 +0000
commit3fc71f7a2b698ab4e7c4e42ca41c3ed8f093a640 (patch)
treee7bfe7663f1111fd04057edb1ad0921b0b4cf1a3
parentfbb15d31b463c8bc13babe5f8d9f406fe1553f1e (diff)
parent6edd8bacb09e8df0c78aed6c3aba503edcab7f17 (diff)
Merge "Update sdc jjb jobs"
-rw-r--r--jjb/integration/integration-templates-csit.yaml73
-rw-r--r--jjb/sdc/sdc-csit.yaml6
2 files changed, 77 insertions, 2 deletions
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 504ee17c1..dac4c2846 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -182,3 +182,76 @@
unstable-if: 0.0
pass-if: 100.0
- lf-infra-publish
+
+- job-template:
+ name: '{project-name}-{stream}-csit-{functionality}-testng'
+ disabled: false
+
+ project-type: freestyle
+ build-node: 'ubuntu1604-docker-8c-8g'
+ node: '{build-node}'
+
+ properties:
+ - lf-infra-properties:
+ project: 'integration'
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - infra-parameters:
+ project: 'integration'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+ - integration-test-plan:
+ test-plan: 'plans/{project-name}/{functionality}'
+ - integration-test-options:
+ test-options: '{robot-options}'
+ - html-publisher-dir:
+ html-dir: '{html-dir}'
+ - html-publisher-files:
+ html-files: '{html-files}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+ triggers:
+ - gerrit-trigger-patch-merged:
+ server: '{server-name}'
+ project: 'integration'
+ branch: '{branch}'
+ files: 'test/csit/**/{project-name}/**'
+ - timed: '@daily'
+ - reverse:
+ jobs: '{obj:trigger_jobs}'
+
+ builders:
+ - integration-install-robotframework
+ - inject:
+ properties-file: 'env.properties'
+ - integration-run-test
+
+ publishers:
+ - integration-robot:
+ unstable-if: 0.0
+ pass-if: 100.0
+ - lf-infra-publish
+ - testng:
+ pattern: archives/testng-results.xml
+ escape-test-description: true
+ escape-exception-msg: true
+ show-failed-builds: true
+ - html-publisher:
+ allow-missing: false
+ dir: '{html-dir}'
+ files: '{html-files}'
+ keep-all: false
+ link-to-last-build: false
+ name: ExtentReport \ No newline at end of file
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 5a4c9bf26..86018ae5d 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -2,8 +2,8 @@
- project:
name: sdc-csit
jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
+ - '{project-name}-{stream}-verify-csit-{functionality}-testng'
+ - '{project-name}-{stream}-csit-{functionality}-testng'
project-name: 'sdc'
stream:
- 'master':
@@ -17,3 +17,5 @@
- '{project-name}-{stream}-docker-version-java-daily'
robot-options: ''
branch: 'master'
+ html-dir: 'archives'
+ html-files: 'SDC_CI_Extent_Report.html' \ No newline at end of file