diff --git a/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml b/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml index 85ecb8afd1..2179711ff0 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml @@ -1,18 +1,5 @@ - job: name: 'gate-ceilometer-python26-essex' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - zuul @@ -30,19 +17,6 @@ - job: name: 'gate-ceilometer-python27-essex' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - zuul diff --git a/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml b/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml index 3c6560d64a..87dd0f5f68 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml @@ -13,10 +13,17 @@ In modules/openstack_project/files/jenkins_jobs

- concurrent: false + project-type: freestyle + concurrent: true wrappers: - timeout: timeout: 30 fail: true - timestamps + + logrotate: + daysToKeep: 1 + numToKeep: -1 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index ee344b275c..6bf18f1da5 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -1,27 +1,19 @@ - job: name: gate-tempest-devstack-vm - project-type: freestyle - concurrent: true node: devstack-precise - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - label: - name: NODE_LABEL - description: Label of node to use for this build - default: devstack-precise - wrappers: - timeout: timeout: 90 fail: true - timestamps + parameters: + - label: + name: NODE_LABEL + description: Label of node to use for this build + default: devstack-precise + triggers: - zuul @@ -80,28 +72,20 @@ - job: name: gate-tempest-devstack-vm-cinder - project-type: freestyle - concurrent: true node: devstack-precise - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - label: - name: NODE_LABEL - description: Label of node to use for this build - default: devstack-precise - wrappers: - timeout: timeout: 90 fail: true - timestamps + parameters: + - label: + name: NODE_LABEL + description: Label of node to use for this build + default: devstack-precise + triggers: - zuul @@ -160,16 +144,8 @@ - job: name: periodic-tempest-devstack-vm-stable-diablo - project-type: freestyle - concurrent: true node: devstack-oneiric - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - wrappers: - timeout: timeout: 90 @@ -234,16 +210,8 @@ - job: name: periodic-tempest-devstack-vm-stable-essex - project-type: freestyle - concurrent: true node: devstack-precise - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - wrappers: - timeout: timeout: 90 @@ -310,16 +278,9 @@ # jenkins slave they are running on can be disabled. - job: name: devstack-update-inprogress - project-type: freestyle concurrent: false node: master - logrotate: - daysToKeep: 28 - numToKeep: 100 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - wrappers: - timeout: timeout: 10 @@ -348,16 +309,9 @@ # jenkins slave may be deleted. - job: name: devstack-update-complete - project-type: freestyle concurrent: false node: master - logrotate: - daysToKeep: 28 - numToKeep: 100 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - wrappers: - timeout: timeout: 10 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml index b49d0b8365..17fd765a0d 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml @@ -1,7 +1,6 @@ - job: name: check-gerrit-unittests project-type: maven - concurrent: true node: precise wrappers: @@ -36,7 +35,6 @@ - job: name: gate-gerrit-unittests project-type: maven - concurrent: true node: precise wrappers: @@ -66,7 +64,6 @@ - job: name: gerrit-package project-type: maven - concurrent: true node: precise wrappers: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml index e29ccf0e7b..00b81303ee 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/horizon.yaml @@ -1,20 +1,7 @@ - job: name: gate-horizon-selenium - concurrent: true node: precise - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul diff --git a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml b/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml index 4219a29ebc..e38deb6f8e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/job-builder.yaml @@ -1,24 +1,10 @@ - job: name: jenkins-job-builder-compare-xml - project-type: freestyle - concurrent: true node: precise - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul - logrotate: - daysToKeep: 1 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - builders: - gerrit-git-prep - shell: "./tools/run-compare-xml.sh" diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml index 3e9032821a..9dfbacf571 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -1,14 +1,8 @@ - job: name: openstack-cli-guide project-type: maven - concurrent: true node: precise - wrappers: - - timeout: - timeout: 40 - fail: true - triggers: - zuul-post @@ -34,14 +28,8 @@ - job: name: netconn-api-v20 project-type: maven - concurrent: true node: precise - wrappers: - - timeout: - timeout: 40 - fail: true - triggers: - zuul-post diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml index 2e8f469587..2a113a9034 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml @@ -1,14 +1,7 @@ - job: name: gate-ci-puppet-syntax - concurrent: true node: precise - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul @@ -23,25 +16,11 @@ - job: name: ci-puppet-compare-xml - project-type: freestyle - concurrent: true node: precise - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul - logrotate: - daysToKeep: 1 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - builders: - gerrit-git-prep - shell: "./tools/run-compare-xml.sh" diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml index 5188b985eb..d4247b44e4 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-publish-jobs.yaml @@ -1,24 +1,10 @@ - job-template: name: '{name}-docs' - project-type: freestyle - concurrent: true node: precise - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul-post - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - builders: - gerrit-git-prep - docs @@ -35,25 +21,11 @@ - job-template: name: '{name}-tarball' - project-type: freestyle - concurrent: true node: precise - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul-post - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - builders: - gerrit-git-prep - tarball: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml index 8f5d4ba1f3..bb3da8ee91 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml @@ -1,24 +1,10 @@ - job-template: name: '{name}-sdist-tarball' - project-type: freestyle - concurrent: true node: precise - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul-post - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - builders: - gerrit-git-prep - shell: | @@ -38,16 +24,8 @@ - job-template: name: '{name}-pypi' - project-type: freestyle - concurrent: true node: pypi - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul-post diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml index a5b5f8207b..bcf6a79c05 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml @@ -1,18 +1,5 @@ - job-template: name: 'periodic-{name}-python26-{branch-name}' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - timed: '@daily' @@ -44,19 +31,6 @@ - job-template: name: 'periodic-{name}-python27-{branch-name}' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - timed: '@daily' @@ -87,19 +61,6 @@ - job-template: name: 'periodic-{name}-docs-{branch-name}' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - timed: '@daily' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml index 309e7892e9..8347d55ed3 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml @@ -1,18 +1,5 @@ - job-template: name: '{name}-coverage' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - zuul-post @@ -38,19 +25,6 @@ - job-template: name: 'gate-{name}-pep8' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - zuul @@ -68,19 +42,6 @@ - job-template: name: 'gate-{name}-pylint' - concurrent: true - - wrappers: - - timeout: - timeout: 120 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - zuul @@ -98,19 +59,6 @@ - job-template: name: 'gate-{name}-python26' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - zuul @@ -137,19 +85,6 @@ - job-template: name: 'gate-{name}-python27' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 parameters: - label: @@ -181,19 +116,6 @@ - job-template: name: 'gate-{name}-merge' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - zuul @@ -209,19 +131,6 @@ - job-template: name: 'gate-{name}-docs' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 triggers: - zuul @@ -238,22 +147,8 @@ - job-template: name: 'gate-{name}-pyflakes' - project-type: freestyle - concurrent: true node: precise - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul diff --git a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml index 246cc6351b..bdaf1a083e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml @@ -1,25 +1,11 @@ # This is a non-standard docs job because it uses SCP instead of FTP - job: name: zuul-docs - project-type: freestyle - concurrent: true node: precise - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - triggers: - zuul-post - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - builders: - gerrit-git-prep - docs @@ -35,19 +21,7 @@ - job: name: 'dev-zuul-coverage' - concurrent: true - - wrappers: - - timeout: - timeout: 30 - fail: true - - timestamps - - logrotate: - daysToKeep: 28 - numToKeep: -1 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 + node: 'precise' triggers: - zuul @@ -67,5 +41,3 @@ - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' copy-console: true copy-after-failure: true - - node: 'precise'