Merge "storperf: Create daily job for storperf"

4 files changed, 201 insertions, 72 deletions

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 07181fcad..4c543bf66 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -617,6 +617,7 @@
                 - 'functest.*'
                 - 'yardstick.*'
                 - 'dovetail.*'
+                - 'storperf.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -778,6 +779,18 @@
                   enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
                   abort-all-job: false
                   git-revision: false
+        - multijob:
+            name: StorPerf
+            condition: ALWAYS
+            projects:
+                - name: 'storperf-apex-baremetal-daily-{scenario_stream}'
+                  node-parameters: true
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                  kill-phase-on: NEVER
+                  abort-all-job: false
+                  git-revision: false
 # Build status is always success due conditional plugin prefetching
 # build status before multijob phases execute
 #        - conditional-step:
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 2d760f854..bd72bf649 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -529,6 +529,7 @@
                 - 'functest.*'
                 - 'yardstick.*'
                 - 'dovetail.*'
+                - 'storperf.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -690,6 +691,18 @@
                   enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
                   abort-all-job: false
                   git-revision: false
+        - multijob:
+            name: StorPerf
+            condition: ALWAYS
+            projects:
+                - name: 'storperf-apex-baremetal-daily-{scenario_stream}'
+                  node-parameters: true
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                  kill-phase-on: NEVER
+                  abort-all-job: false
+                  git-revision: false
 # Build status is always success due conditional plugin prefetching
 # build status before multijob phases execute
 #        - conditional-step:
diff --git a/jjb/storperf/storperf-daily-jobs.yml b/jjb/storperf/storperf-daily-jobs.yml
new file mode 100644
index 000000000..e849e29e1
--- /dev/null
+++ b/jjb/storperf/storperf-daily-jobs.yml
@@ -0,0 +1,175 @@
+###################################
+# job configuration for storperf
+###################################
+- project:
+    name: storperf-daily
+
+    project: storperf
+
+#--------------------------------
+# BRANCH ANCHORS
+#--------------------------------
+    master: &master
+        stream: master
+        branch: '{stream}'
+        gs-pathname: ''
+        docker-tag: 'latest'
+#--------------------------------
+# POD, INSTALLER, AND BRANCH MAPPING
+#--------------------------------
+#    Installers using labels
+#            CI PODs
+# This section should only contain the installers
+# that have been switched using labels for slaves
+#--------------------------------
+    pod:
+## fuel CI PODs
+#        - baremetal:
+#            slave-label: fuel-baremetal
+#            installer: fuel
+#            <<: *master
+#        - virtual:
+#            slave-label: fuel-virtual
+#            installer: fuel
+#            <<: *master
+## joid CI PODs
+#        - baremetal:
+#            slave-label: joid-baremetal
+#            installer: joid
+#            <<: *master
+#        - virtual:
+#            slave-label: joid-virtual
+#            installer: joid
+#            <<: *master
+## compass CI PODs
+#        - baremetal:
+#            slave-label: compass-baremetal
+#            installer: compass
+#            <<: *master
+#        - virtual:
+#            slave-label: compass-virtual
+#            installer: compass
+#            <<: *master
+## apex CI PODs
+#        - virtual:
+#            slave-label: apex-virtual-master
+#            installer: apex
+#            <<: *master
+        - baremetal:
+            slave-label: apex-baremetal-master
+            installer: apex
+            <<: *master
+## armband CI PODs
+#        - armband-baremetal:
+#            slave-label: armband-baremetal
+#            installer: fuel
+#            <<: *master
+#        - armband-virtual:
+#            slave-label: armband-virtual
+#            installer: fuel
+#            <<: *master
+## daisy CI PODs
+#        - baremetal:
+#            slave-label: daisy-baremetal
+#            installer: daisy
+#            <<: *master
+#        - virtual:
+#            slave-label: daisy-virtual
+#            installer: daisy
+#            <<: *master
+
+    jobs:
+        - 'storperf-{installer}-{pod}-daily-{stream}'
+
+################################
+# job template
+################################
+- job-template:
+    name: 'storperf-{installer}-{pod}-daily-{stream}'
+
+    concurrent: true
+
+    properties:
+        - logrotate-default
+        - throttle:
+            enabled: true
+            max-per-node: 1
+            option: 'project'
+
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: '30'
+            abort: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - '{installer}-defaults'
+        - '{slave-label}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+        - string:
+            name: DOCKER_TAG
+            default: '{docker-tag}'
+            description: 'Tag to pull docker image'
+        - string:
+            name: CLEAN_DOCKER_IMAGES
+            default: 'false'
+            description: 'Remove downloaded docker images (opnfv/storperf*:*)'
+        - string:
+            name: GS_PATHNAME
+            default: '{gs-pathname}'
+            description: "Version directory where the opnfv documents will be stored in gs repository"
+        - string:
+            name: DISK_TYPE
+            default: 'HDD'
+            description: 'The type of hard disk that Cinder uses'
+        - string:
+            name: VOLUME_SIZE
+            default: '2'
+            description: 'Size of Cinder volume (in GB)'
+        - string:
+            name: WORKLOADS
+            default: 'rw'
+            description: 'Workloads to run'
+        - string:
+            name: BLOCK_SIZES
+            default: '16384'
+            description: 'Block sizes for VM I/O operations'
+        - string:
+            name: QUEUE_DEPTHS
+            default: '4'
+            description: 'Number of simultaneous I/O operations to keep active'
+        - string:
+            name: STEADY_STATE_SAMPLES
+            default: '10'
+            description: 'Number of samples to use (1 per minute) to measure steady state'
+        - string:
+            name: TEST_CASE
+            choices:
+                - 'snia_steady_state'
+            description: 'The test case to run'
+
+    scm:
+        - git-scm
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - 'storperf-daily-builder'
+
+########################
+# builder macros
+########################
+- builder:
+    name: storperf-daily-builder
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            cd $WORKSPACE
+            ./ci/daily.sh
diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index f675cbb2a..626c5c332 100644
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -6,7 +6,6 @@
     jobs:
         - 'storperf-verify-{stream}'
         - 'storperf-merge-{stream}'
-        - 'storperf-daily-{stream}'
 
     stream:
         - master:
@@ -138,74 +137,3 @@
                     failing: 30
         - email-jenkins-admins-on-failure
 
-- job-template:
-    name: 'storperf-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    disabled: '{obj:disabled}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'intel-pod9-defaults'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-noha'
-        - string:
-            name: DOCKER_TAG
-            default: '{docker-tag}'
-            description: 'Tag to pull docker image'
-        - choice:
-            name: DISK_TYPE
-            choices:
-                - 'SSD'
-                - 'HDD'
-            default: 'HDD'
-            description: 'The type of hard disk that Cinder uses'
-        - string:
-            name: AGENT_COUNT
-            description: 'The number of slave agents to start. Defaults to the cinder node count'
-        - string:
-            name: VOLUME_SIZE
-            default: '4'
-            description: 'Size of Cinder volume (in GB)'
-        - string:
-            name: WORKLOADS
-            default: 'wr,rr,rw'
-            description: 'Workloads to run'
-        - string:
-            name: BLOCK_SIZES
-            default: '2048,16384'
-            description: 'Block sizes for VM I/O operations'
-        - string:
-            name: QUEUE_DEPTHS
-            default: '1,4'
-            description: 'Number of simultaneous I/O operations to keep active'
-        - string:
-            name: STEADY_STATE_SAMPLES
-            default: '10'
-            description: 'Number of samples to use (1 per minute) to measure steady state'
-        - string:
-            name: DEADLINE
-            description: 'Maximum run time in minutes if steady state cannot be found. Defaults to 3 times steady state samples'
-        - choice:
-            name: TEST_CASE
-            choices:
-                - 'snia_steady_state'
-            description: 'The test case to run'
-
-    scm:
-        - git-scm
-
-    triggers:
-        - timed: '0 22 * * *'
-
-    builders:
-        - shell: |
-            $WORKSPACE/ci/daily.sh
-