Merge "This patch includes scripts for implementing kvmfornfv daily jobs to trigger cyclictest with stress applied and packet forwarding test cases."

2 files changed, 116 insertions, 11 deletions

diff --git a/jjb/kvmfornfv/kvmfornfv-test.sh b/jjb/kvmfornfv/kvmfornfv-test.sh
index 06377ac4f..f677f470d 100755
--- a/jjb/kvmfornfv/kvmfornfv-test.sh
+++ b/jjb/kvmfornfv/kvmfornfv-test.sh
@@ -18,7 +18,7 @@ case "$JOB_TYPE" in
     verify|daily)
         #start the test
         cd $WORKSPACE
-        ./ci/test_kvmfornfv.sh $JOB_TYPE
+        ./ci/test_kvmfornfv.sh $JOB_TYPE $TEST_NAME
         ;;
     *)
         echo "Test is not enabled for $JOB_TYPE jobs"
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index b6a55fe6a..2c8446e07 100644
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -23,12 +23,22 @@
 #####################################
 # patch verification phases
 #####################################
+    testname:
+        - 'Idle_Idle':
+            trigger_time: '@midnight'
+        - 'Stress_Idle':
+            trigger_time: '@midnight+3hours'
+        - 'Packet_Forwarding':
+            trigger_time: '@midnight+6hours'
+#####################################
+# patch verification phases
+#####################################
     jobs:
         - 'kvmfornfv-verify-{stream}'
         - 'kvmfornfv-verify-{phase}-{stream}'
         - 'kvmfornfv-merge-{stream}'
-        - 'kvmfornfv-daily-{stream}'
-        - 'kvmfornfv-daily-{phase}-{stream}'
+        - 'kvmfornfv-{testname}-daily-{stream}'
+        - 'kvmfornfv-{testname}-daily-{phase}-{stream}'
 #####################################
 # job templates
 #####################################
@@ -103,6 +113,7 @@
                   kill-phase-on: FAILURE
                   abort-all-job: true
 
+
 - job-template:
     name: 'kvmfornfv-verify-{phase}-{stream}'
 
@@ -175,7 +186,7 @@
             !include-raw: ./kvmfornfv-build.sh
 
 - job-template:
-    name: 'kvmfornfv-daily-{stream}'
+    name: 'kvmfornfv-{testname}-daily-{stream}'
 
     project-type: multijob
 
@@ -199,7 +210,7 @@
             choosing-strategy: 'default'
 
     triggers:
-         - timed: '@midnight'
+        - timed: '{trigger_time}'
 
     builders:
         - description-setter:
@@ -208,17 +219,59 @@
             name: build
             condition: SUCCESSFUL
             projects:
-                - name: 'kvmfornfv-daily-build-{stream}'
+                - name: 'kvmfornfv-Idle_Idle-daily-build-{stream}'
+                  current-parameters: false
+                  node-parameters: false
+                  git-revision: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+        - multijob:
+            name: build
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-Stress_Idle-daily-build-{stream}'
+                  current-parameters: false
+                  node-parameters: false
+                  git-revision: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+        - multijob:
+            name: build
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-Packet_Forwarding-daily-build-{stream}'
                   current-parameters: false
                   node-parameters: false
                   git-revision: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
+
+        - multijob:
+            name: build
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-Idle_Idle-daily-test-{stream}'
+                  current-parameters: false
+                  node-parameters: false
+                  git-revision: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+
         - multijob:
             name: test
             condition: SUCCESSFUL
             projects:
-                - name: 'kvmfornfv-daily-test-{stream}'
+                - name: 'kvmfornfv-Stress_Idle-daily-test-{stream}'
+                  current-parameters: false
+                  node-parameters: false
+                  git-revision: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+        - multijob:
+            name: build
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-Packet_Forwarding-daily-build-{stream}'
                   current-parameters: false
                   node-parameters: false
                   git-revision: true
@@ -227,7 +280,7 @@
 
 
 - job-template:
-    name: 'kvmfornfv-daily-{phase}-{stream}'
+    name: 'kvmfornfv-{testname}-daily-{phase}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -258,7 +311,31 @@
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
-        - '{project}-daily-{phase}-macro'
+        - '{project}-{testname}-daily-{phase}-macro'
+########################
+# parameter macros
+########################
+- parameter:
+    name: 'kvmfornfv-Idle_Idle-daily-parameter'
+    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'
+    parameters:
+        - string:
+            name: TEST_NAME
+            default: 'stress_idle'
+            description: "Daily job to run cyclictest with stress applied"
+- parameter:
+    name: 'kvmfornfv-Packet_Forwarding-daily-parameter'
+    parameters:
+        - string:
+            name: TEST_NAME
+            default: 'packet_forward'
+            description: "Daily job to run packet forwarding test cases"
 #####################################
 # builder macros
 #####################################
@@ -277,14 +354,42 @@
         - shell:
             !include-raw: ./kvmfornfv-test.sh
 - builder:
-    name: 'kvmfornfv-daily-build-macro'
+    name: 'kvmfornfv-Idle_Idle-daily-build-macro'
+    builders:
+        - shell:
+            !include-raw: ./kvmfornfv-build.sh
+        - shell:
+            !include-raw: ./kvmfornfv-upload-artifact.sh
+- builder:
+    name: 'kvmfornfv-Stress_Idle-daily-build-macro'
+    builders:
+        - shell:
+            !include-raw: ./kvmfornfv-build.sh
+        - shell:
+            !include-raw: ./kvmfornfv-upload-artifact.sh
+- builder:
+    name: 'kvmfornfv-Packet_Forwarding-daily-build-macro'
     builders:
         - shell:
             !include-raw: ./kvmfornfv-build.sh
         - shell:
             !include-raw: ./kvmfornfv-upload-artifact.sh
 - builder:
-    name: 'kvmfornfv-daily-test-macro'
+    name: 'kvmfornfv-Idle_Idle-daily-test-macro'
+    builders:
+        - shell:
+            !include-raw: ./kvmfornfv-download-artifact.sh
+        - shell:
+            !include-raw: ./kvmfornfv-test.sh
+- builder:
+    name: 'kvmfornfv-Stress_Idle-daily-test-macro'
+    builders:
+        - shell:
+            !include-raw: ./kvmfornfv-download-artifact.sh
+        - shell:
+            !include-raw: ./kvmfornfv-test.sh
+- builder:
+    name: 'kvmfornfv-Packet_Forwarding-daily-test-macro'
     builders:
         - shell:
             !include-raw: ./kvmfornfv-download-artifact.sh