summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2017-10-10 19:23:32 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-10 19:23:32 +0000
commitc1217677631cd8da04a17af3d0731f7351da551c (patch)
tree166f20d4fd11d6798e8c532606a122f71cd608cd
parentaca06893311c0b7969441b820f87d671696085e0 (diff)
parente9adf572a5023800bcf2acac6b7015e05b560650 (diff)
Merge "Fix Yamllint violations for jjb/storperf"
-rw-r--r--jjb/storperf/storperf-daily-jobs.yml293
-rw-r--r--jjb/storperf/storperf-verify-jobs.yml279
-rw-r--r--jjb/storperf/storperf.yml106
3 files changed, 343 insertions, 335 deletions
diff --git a/jjb/storperf/storperf-daily-jobs.yml b/jjb/storperf/storperf-daily-jobs.yml
index bf04712c7..ebc78237e 100644
--- a/jjb/storperf/storperf-daily-jobs.yml
+++ b/jjb/storperf/storperf-daily-jobs.yml
@@ -1,3 +1,4 @@
+---
###################################
# job configuration for storperf
###################################
@@ -6,90 +7,90 @@
project: storperf
-#--------------------------------
-# BRANCH ANCHORS
-#--------------------------------
+ # -------------------------------
+ # BRANCH ANCHORS
+ # -------------------------------
master: &master
- stream: master
- branch: '{stream}'
- gs-pathname: ''
- docker-tag: 'latest'
+ stream: master
+ branch: '{stream}'
+ gs-pathname: ''
+ docker-tag: 'latest'
euphrates: &euphrates
- stream: euphrates
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- docker-tag: 'stable'
-#--------------------------------
-# 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
-#--------------------------------
+ stream: euphrates
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+ docker-tag: 'stable'
+ # -------------------------------
+ # 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
- - baremetal:
- slave-label: apex-baremetal-master
- installer: apex
- <<: *euphrates
-## 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
+ # # 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
+ - baremetal:
+ slave-label: apex-baremetal-master
+ installer: apex
+ <<: *euphrates
+ ## 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}'
+ - 'storperf-{installer}-{pod}-daily-{stream}'
################################
# job template
@@ -100,77 +101,77 @@
concurrent: true
properties:
- - logrotate-default
- - throttle:
- enabled: true
- max-per-node: 1
- option: 'project'
+ - 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
+ - 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'
+ - 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
+ - git-scm
builders:
- - description-setter:
- description: "Built on $NODE_NAME"
- - 'storperf-daily-builder'
+ - description-setter:
+ description: "Built on $NODE_NAME"
+ - 'storperf-daily-builder'
########################
# builder macros
@@ -178,8 +179,8 @@
- builder:
name: storperf-daily-builder
builders:
- - shell: |
- #!/bin/bash
+ - shell: |
+ #!/bin/bash
- cd $WORKSPACE
- ./ci/daily.sh
+ cd $WORKSPACE
+ ./ci/daily.sh
diff --git a/jjb/storperf/storperf-verify-jobs.yml b/jjb/storperf/storperf-verify-jobs.yml
index 0b01fd1f3..7e29addb9 100644
--- a/jjb/storperf/storperf-verify-jobs.yml
+++ b/jjb/storperf/storperf-verify-jobs.yml
@@ -1,41 +1,42 @@
+---
- project:
name: storperf-verify
project: 'storperf'
-#--------------------------------
-# branches
-#--------------------------------
+ # -------------------------------
+ # branches
+ # -------------------------------
stream:
- - master:
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
- docker-tag: 'latest'
- - euphrates:
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- docker-tag: 'stable'
-#--------------------------------
-# patch verification phases
-#--------------------------------
+ - master:
+ branch: '{stream}'
+ gs-pathname: ''
+ disabled: false
+ docker-tag: 'latest'
+ - euphrates:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+ docker-tag: 'stable'
+ # -------------------------------
+ # patch verification phases
+ # -------------------------------
phase:
- - 'unit-test':
- slave-label: 'opnfv-build-ubuntu'
- - 'build-x86_64':
- slave-label: 'opnfv-build-ubuntu'
- - 'build-aarch64':
- slave-label: 'opnfv-build-ubuntu-arm'
-#--------------------------------
-# jobs
-#--------------------------------
+ - 'unit-test':
+ slave-label: 'opnfv-build-ubuntu'
+ - 'build-x86_64':
+ slave-label: 'opnfv-build-ubuntu'
+ - 'build-aarch64':
+ slave-label: 'opnfv-build-ubuntu-arm'
+ # -------------------------------
+ # jobs
+ # -------------------------------
jobs:
- - 'storperf-verify-{stream}'
- - 'storperf-verify-{phase}-{stream}'
-#--------------------------------
+ - 'storperf-verify-{stream}'
+ - 'storperf-verify-{phase}-{stream}'
+# -------------------------------
# job templates
-#--------------------------------
+# -------------------------------
- job-template:
name: 'storperf-verify-{stream}'
@@ -44,80 +45,80 @@
project-type: 'multijob'
parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - 'opnfv-build-defaults'
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - 'opnfv-build-defaults'
scm:
- - git-scm-gerrit
+ - git-scm-gerrit
triggers:
- - gerrit:
- server-name: 'gerrit.opnfv.org'
- trigger-on:
- - patchset-created-event:
- exclude-drafts: 'false'
- exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
- - draft-published-event
- - comment-added-contains-event:
- comment-contains-value: 'recheck'
- - comment-added-contains-event:
- comment-contains-value: 'reverify'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
builders:
- - shell: |
- #!/bin/bash
-
- # we do nothing here as the main stuff will be done
- # in phase jobs
- echo "Triggering phase jobs!"
- - multijob:
- name: 'storperf-build-and-unittest'
- execution-type: PARALLEL
- projects:
- - name: 'storperf-verify-unit-test-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
- - name: 'storperf-verify-build-x86_64-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- ARCH=x86_64
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
- - name: 'storperf-verify-build-aarch64-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- ARCH=aarch64
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
+ - shell: |
+ #!/bin/bash
+
+ # we do nothing here as the main stuff will be done
+ # in phase jobs
+ echo "Triggering phase jobs!"
+ - multijob:
+ name: 'storperf-build-and-unittest'
+ execution-type: PARALLEL
+ projects:
+ - name: 'storperf-verify-unit-test-{stream}'
+ current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ git-revision: true
+ node-parameters: false
+ kill-phase-on: FAILURE
+ abort-all-job: false
+ - name: 'storperf-verify-build-x86_64-{stream}'
+ current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ ARCH=x86_64
+ git-revision: true
+ node-parameters: false
+ kill-phase-on: FAILURE
+ abort-all-job: false
+ - name: 'storperf-verify-build-aarch64-{stream}'
+ current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ ARCH=aarch64
+ git-revision: true
+ node-parameters: false
+ kill-phase-on: FAILURE
+ abort-all-job: false
- job-template:
name: 'storperf-verify-{phase}-{stream}'
@@ -125,71 +126,75 @@
disabled: '{obj:disabled}'
wrappers:
- - ssh-agent-wrapper
- - build-timeout:
- timeout: 60
+ - ssh-agent-wrapper
+ - build-timeout:
+ timeout: 60
parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - '{slave-label}-defaults'
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - '{slave-label}-defaults'
scm:
- - git-scm-gerrit
+ - git-scm-gerrit
builders:
- - 'storperf-verify-{phase}-builders-macro'
+ - 'storperf-verify-{phase}-builders-macro'
publishers:
- - 'storperf-verify-{phase}-publishers-macro'
-#--------------------------------
+ - 'storperf-verify-{phase}-publishers-macro'
+# -------------------------------
# builder macros
-#--------------------------------
+# -------------------------------
- builder:
name: 'storperf-verify-unit-test-builders-macro'
builders:
- - shell: |
- $WORKSPACE/ci/verify.sh
+ - shell: |
+ $WORKSPACE/ci/verify.sh
+
- builder:
name: 'storperf-verify-build-x86_64-builders-macro'
builders:
- - shell: |
- $WORKSPACE/ci/verify-build.sh
+ - shell: |
+ $WORKSPACE/ci/verify-build.sh
+
- builder:
name: 'storperf-verify-build-aarch64-builders-macro'
builders:
- - shell: |
- $WORKSPACE/ci/verify-build.sh
-#--------------------------------
+ - shell: |
+ $WORKSPACE/ci/verify-build.sh
+# -------------------------------
# publisher macros
-#--------------------------------
+# -------------------------------
- publisher:
name: 'storperf-verify-unit-test-publishers-macro'
publishers:
- - junit:
- results: nosetests.xml
- - cobertura:
- report-file: "coverage.xml"
- only-stable: "true"
- health-auto-update: "true"
- stability-auto-update: "true"
- zoom-coverage-chart: "true"
- targets:
- - files:
- healthy: 60
- unhealthy: 50
- failing: 40
- - method:
- healthy: 60
- unhealthy: 50
- failing: 40
- - email-jenkins-admins-on-failure
+ - junit:
+ results: nosetests.xml
+ - cobertura:
+ report-file: "coverage.xml"
+ only-stable: "true"
+ health-auto-update: "true"
+ stability-auto-update: "true"
+ zoom-coverage-chart: "true"
+ targets:
+ - files:
+ healthy: 60
+ unhealthy: 50
+ failing: 40
+ - method:
+ healthy: 60
+ unhealthy: 50
+ failing: 40
+ - email-jenkins-admins-on-failure
+
- publisher:
name: 'storperf-verify-build-x86_64-publishers-macro'
publishers:
- - email-jenkins-admins-on-failure
+ - email-jenkins-admins-on-failure
+
- publisher:
name: 'storperf-verify-build-aarch64-publishers-macro'
publishers:
- - email-jenkins-admins-on-failure
+ - email-jenkins-admins-on-failure
diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index caae853a0..b9f3a3679 100644
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -1,22 +1,23 @@
+---
- project:
name: storperf
project: '{name}'
jobs:
- - 'storperf-merge-{stream}'
+ - 'storperf-merge-{stream}'
stream:
- - master:
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
- docker-tag: 'latest'
- - euphrates:
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- docker-tag: 'stable'
+ - master:
+ branch: '{stream}'
+ gs-pathname: ''
+ disabled: false
+ docker-tag: 'latest'
+ - euphrates:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+ docker-tag: 'stable'
- job-template:
name: 'storperf-merge-{stream}'
@@ -24,52 +25,53 @@
node: opnfv-build-ubuntu
parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ # yamllint disable rule:line-length
+ description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ # yamllint enable rule:line-length
scm:
- - git-scm
+ - git-scm
triggers:
- - gerrit:
- server-name: 'gerrit.opnfv.org'
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: 'remerge'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
builders:
- - shell: |
- $WORKSPACE/ci/merge.sh
+ - shell: |
+ $WORKSPACE/ci/merge.sh
publishers:
- - junit:
- results: nosetests.xml
- - cobertura:
- report-file: "coverage.xml"
- only-stable: "true"
- health-auto-update: "true"
- stability-auto-update: "true"
- zoom-coverage-chart: "true"
- targets:
- - files:
- healthy: 10
- unhealthy: 20
- failing: 30
- - method:
- healthy: 50
- unhealthy: 40
- failing: 30
- - email-jenkins-admins-on-failure
-
+ - junit:
+ results: nosetests.xml
+ - cobertura:
+ report-file: "coverage.xml"
+ only-stable: "true"
+ health-auto-update: "true"
+ stability-auto-update: "true"
+ zoom-coverage-chart: "true"
+ targets:
+ - files:
+ healthy: 10
+ unhealthy: 20
+ failing: 30
+ - method:
+ healthy: 50
+ unhealthy: 40
+ failing: 30
+ - email-jenkins-admins-on-failure