summaryrefslogtreecommitdiffstats
path: root/jjb/kvmfornfv/kvmfornfv.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/kvmfornfv/kvmfornfv.yml')
-rw-r--r--jjb/kvmfornfv/kvmfornfv.yml66
1 files changed, 41 insertions, 25 deletions
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 9624778f8..e5b56bf9b 100644
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -34,7 +34,8 @@
- 'kvmfornfv-verify-{phase}-{stream}'
- 'kvmfornfv-merge-{stream}'
- 'kvmfornfv-daily-{stream}'
- - 'kvmfornfv-{testname}-daily-{phase}-{stream}'
+ - 'kvmfornfv-daily-build-{stream}'
+ - 'kvmfornfv-{testname}-daily-test-{stream}'
#####################################
# job templates
#####################################
@@ -209,7 +210,7 @@
name: cyclictest-build
condition: SUCCESSFUL
projects:
- - name: 'kvmfornfv-cyclictest-daily-build-{stream}'
+ - name: 'kvmfornfv-daily-build-{stream}'
current-parameters: false
node-parameters: false
git-revision: true
@@ -226,16 +227,6 @@
kill-phase-on: FAILURE
abort-all-job: true
- multijob:
- name: packetforward-build
- condition: SUCCESSFUL
- projects:
- - name: 'kvmfornfv-packet_forward-daily-build-{stream}'
- current-parameters: false
- node-parameters: false
- git-revision: true
- kill-phase-on: FAILURE
- abort-all-job: true
- - multijob:
name: packetforward-test
condition: SUCCESSFUL
projects:
@@ -247,7 +238,7 @@
abort-all-job: true
- job-template:
- name: 'kvmfornfv-{testname}-daily-{phase}-{stream}'
+ name: 'kvmfornfv-daily-build-{stream}'
disabled: '{obj:disabled}'
@@ -265,7 +256,39 @@
- project-parameter:
project: '{project}'
branch: '{branch}'
- - '{slave-label}-defaults'
+ - 'opnfv-build-ubuntu-defaults'
+ - 'kvmfornfv-defaults':
+ gs-pathname: '{gs-pathname}'
+ - string:
+ name: PHASE
+ default: 'build'
+ description: "Execution of kvmfornfv daily 'build' job ."
+
+ builders:
+ - description-setter:
+ description: "Built on $NODE_NAME"
+ - '{project}-daily-build-macro'
+
+- job-template:
+ name: 'kvmfornfv-{testname}-daily-test-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ concurrent: false
+
+ scm:
+ - git-scm
+
+ wrappers:
+ - ssh-agent-wrapper
+ - timeout:
+ timeout: 360
+ fail: true
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - 'intel-pod10-defaults'
- 'kvmfornfv-defaults':
gs-pathname: '{gs-pathname}'
- string:
@@ -274,13 +297,13 @@
description: "Daily job to execute kvmfornfv '{testname}' testcase."
- string:
name: PHASE
- default: '{phase}'
- description: "Execution of kvmfornfv daily '{phase}' job ."
+ default: 'test'
+ description: "Execution of kvmfornfv daily 'test' job ."
builders:
- description-setter:
description: "Built on $NODE_NAME"
- - '{project}-{testname}-daily-{phase}-macro'
+ - '{project}-{testname}-daily-test-macro'
#####################################
# builder macros
#####################################
@@ -299,7 +322,7 @@
- shell:
!include-raw: ./kvmfornfv-test.sh
- builder:
- name: 'kvmfornfv-cyclictest-daily-build-macro'
+ name: 'kvmfornfv-daily-build-macro'
builders:
- shell:
!include-raw: ./kvmfornfv-build.sh
@@ -315,13 +338,6 @@
- shell:
!include-raw: ./kvmfornfv-upload-artifact.sh
- builder:
- name: 'kvmfornfv-packet_forward-daily-build-macro'
- builders:
- - shell:
- !include-raw: ./kvmfornfv-build.sh
- - shell:
- !include-raw: ./kvmfornfv-upload-artifact.sh
-- builder:
name: 'kvmfornfv-packet_forward-daily-test-macro'
builders:
- shell: