diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-11-23 10:57:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-23 10:57:14 +0000 |
| commit | 0b9074ae2116eea2b1b88a14208fbf5742d7ef80 (patch) | |
| tree | 275b4d1a847078eb0db8452415948439351da385 | |
| parent | b5da2ad070c19014c969b862ef289f7d454b5d81 (diff) | |
| parent | 4807f9719b8e79a6054805fc2e3a57145529a9d3 (diff) | |
Merge "KVMFORNFV: Implementing kvmfornfv daily jobs."
| -rwxr-xr-x | jjb/kvmfornfv/kvmfornfv-test.sh | 9 | ||||
| -rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/jjb/kvmfornfv/kvmfornfv-test.sh b/jjb/kvmfornfv/kvmfornfv-test.sh index f677f470d..b31d61cce 100755 --- a/jjb/kvmfornfv/kvmfornfv-test.sh +++ b/jjb/kvmfornfv/kvmfornfv-test.sh @@ -13,9 +13,16 @@ else exit 1 fi +echo $TEST_NAME + # do stuff differently based on the job type case "$JOB_TYPE" in - verify|daily) + verify) + #start the test + cd $WORKSPACE + ./ci/test_kvmfornfv.sh $JOB_TYPE + ;; + daily) #start the test cd $WORKSPACE ./ci/test_kvmfornfv.sh $JOB_TYPE $TEST_NAME diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 2c8446e07..04fce221c 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -112,8 +112,6 @@ node-parameters: false kill-phase-on: FAILURE abort-all-job: true - - - job-template: name: 'kvmfornfv-verify-{phase}-{stream}' @@ -271,7 +269,7 @@ name: build condition: SUCCESSFUL projects: - - name: 'kvmfornfv-Packet_Forwarding-daily-build-{stream}' + - name: 'kvmfornfv-Packet_Forwarding-daily-test-{stream}' current-parameters: false node-parameters: false git-revision: true @@ -316,21 +314,21 @@ # parameter macros ######################## - parameter: - name: 'kvmfornfv-Idle_Idle-daily-parameter' + name: 'kvmfornfv-Idle_Idle-daily-test-{stream}' parameters: - string: name: TEST_NAME default: 'idle_idle' description: "Daily job to run cyclictest without applying any stress" - parameter: - name: 'kvmfornfv-Stress_Idle-daily-parameter' + name: 'kvmfornfv-Stress_Idle-daily-test-{stream}' parameters: - string: name: TEST_NAME default: 'stress_idle' description: "Daily job to run cyclictest with stress applied" - parameter: - name: 'kvmfornfv-Packet_Forwarding-daily-parameter' + name: 'kvmfornfv-Packet_Forwarding-daily-test-{stream}' parameters: - string: name: TEST_NAME |