From 705c1d59481ce64344691a1d37ffc102897bed3d Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 2 Aug 2013 09:35:38 -0700 Subject: [PATCH] Trigger periodic jobs with Zuul This takes care of all the current jobs started by a timer in Jenkins except the devstack-gate maintenance jobs. For the time being, there will continue to be a set of those jobs for each Jenkins master (as opposed to other periodic jobs which we want to run only once globally). In the future we can evolve devstack- gate to run as a single daemon and remove those jobs. Change-Id: I1215b7cb51ffcd65b69d1b54e9f8d051a406a57a --- .../config/devstack-gate.yaml | 24 ------- .../jenkins_job_builder/config/gitdm.yaml | 3 - .../jenkins_job_builder/config/mirror.yaml | 6 -- .../config/python-bitrot-jobs.yaml | 9 --- .../config/translation-jobs.yaml | 6 -- .../openstack_project/files/zuul/layout.yaml | 69 ++++++++++++++++++- 6 files changed, 67 insertions(+), 50 deletions(-) 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 53229336bb..baac87b0c6 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 @@ -279,9 +279,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - parameters: - string: name: ZUUL_BRANCH @@ -317,9 +314,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - parameters: - string: name: ZUUL_BRANCH @@ -356,9 +350,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - parameters: - string: name: ZUUL_BRANCH @@ -395,9 +386,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - parameters: - string: name: ZUUL_BRANCH @@ -435,9 +423,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - parameters: - string: name: ZUUL_BRANCH @@ -474,9 +459,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - parameters: - string: name: ZUUL_BRANCH @@ -513,9 +495,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - parameters: - string: name: ZUUL_BRANCH @@ -552,9 +531,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - parameters: - string: name: ZUUL_BRANCH diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml index 66a79efe94..fbfe467d2b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gitdm.yaml @@ -20,9 +20,6 @@ name: periodic-gitdm node: precise - triggers: - - timed: '0 6 * * *' - builders: - gerrit-git-prep - shell: | diff --git a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml index 8f9cc9f38f..ba13628d49 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml @@ -9,9 +9,6 @@ fail: true - timestamps - triggers: - - timed: '4 21 * * *' - builders: - update-pypi-mirror @@ -50,9 +47,6 @@ fail: true - timestamps - triggers: - - timed: '12 21 * * *' - builders: - update-pypi-mirror 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 57c5d3c9ce..d0f3d19c5e 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 @@ -7,9 +7,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - builders: - python26: github-org: '{github-org}' @@ -45,9 +42,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - builders: - python27: github-org: '{github-org}' @@ -83,9 +77,6 @@ fail: true - timestamps - triggers: - - timed: '0 6 * * *' - builders: - docs: github-org: '{github-org}' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml index a0e7eb6a40..a0be69eb19 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml @@ -17,9 +17,6 @@ name: '{name}-propose-translation-update' concurrent: false - triggers: - - timed: '@daily' - builders: - shell: | #!/bin/bash -xe @@ -55,9 +52,6 @@ name: manuals-propose-translation-update concurrent: false - triggers: - - timed: '@daily' - builders: - shell: | #!/bin/bash -xe diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 45b0229167..3a224ceef2 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -79,7 +79,7 @@ pipelines: precedence: low trigger: timer: - - time: '0 0 * * *' + - time: '0 6 * * *' jobs: @@ -473,6 +473,11 @@ projects: release: - cinder-tarball - cinder-docs + periodic: + - cinder-propose-translation-update + - periodic-cinder-docs-stable-grizzly + - periodic-cinder-python26-stable-grizzly + - periodic-cinder-python27-stable-grizzly - name: openstack/glance check: @@ -511,6 +516,14 @@ projects: release: - glance-tarball - glance-docs + periodic: + - glance-propose-translation-update + - periodic-glance-docs-stable-folsom + - periodic-glance-python26-stable-folsom + - periodic-glance-python27-stable-folsom + - periodic-glance-docs-stable-grizzly + - periodic-glance-python26-stable-grizzly + - periodic-glance-python27-stable-grizzly - name: openstack/horizon check: @@ -553,6 +566,13 @@ projects: release: - horizon-tarball - horizon-docs + periodic: + - periodic-horizon-docs-stable-folsom + - periodic-horizon-python26-stable-folsom + - periodic-horizon-python27-stable-folsom + - periodic-horizon-docs-stable-grizzly + - periodic-horizon-python26-stable-grizzly + - periodic-horizon-python27-stable-grizzly - name: openstack/django_openstack_auth check: @@ -617,7 +637,14 @@ projects: release: - keystone-tarball - keystone-docs - + periodic: + - keystone-propose-translation-update + - periodic-keystone-docs-stable-folsom + - periodic-keystone-python26-stable-folsom + - periodic-keystone-python27-stable-folsom + - periodic-keystone-docs-stable-grizzly + - periodic-keystone-python26-stable-grizzly + - periodic-keystone-python27-stable-grizzly - name: openstack/nova check: @@ -659,6 +686,14 @@ projects: release: - nova-tarball - nova-docs + periodic: + - nova-propose-translation-update + - periodic-nova-docs-stable-folsom + - periodic-nova-python26-stable-folsom + - periodic-nova-python27-stable-folsom + - periodic-nova-docs-stable-grizzly + - periodic-nova-python26-stable-grizzly + - periodic-nova-python27-stable-grizzly - name: openstack/oslo-incubator check: @@ -780,6 +815,11 @@ projects: release: - neutron-tarball - neutron-docs + periodic: + - neutron-propose-translation-update + - periodic-neutron-docs-stable-grizzly + - periodic-neutron-python26-stable-grizzly + - periodic-neutron-python27-stable-grizzly - name: openstack/swift check: @@ -1105,6 +1145,9 @@ projects: post: - post-mirror-python26 - post-mirror-python27 + periodic: + - periodic-mirror-python26 + - periodic-mirror-python27 - name: openstack-dev/grenade check: @@ -1268,6 +1311,15 @@ projects: post: - tempest-docs - tempest-branch-tarball + periodic: + - periodic-tempest-devstack-vm-stable-folsom + - periodic-tempest-devstack-vm-cinder-stable-folsom + - periodic-tempest-devstack-vm-stable-grizzly + - periodic-tempest-devstack-vm-neutron-stable-grizzly + - periodic-tempest-devstack-vm-postgres-stable-grizzly + - periodic-tempest-devstack-vm-all + - periodic-tempest-devstack-vm-coverage + - periodic-tempest-devstack-vm-stress - name: openstack/ceilometer check: @@ -1292,6 +1344,11 @@ projects: release: - ceilometer-docs - ceilometer-tarball + periodic: + - ceilometer-propose-translation-update + - periodic-ceilometer-docs-stable-grizzly + - periodic-ceilometer-python26-stable-grizzly + - periodic-ceilometer-python27-stable-grizzly - name: stackforge/MRaaS check: @@ -1358,6 +1415,10 @@ projects: release: - heat-tarball - heat-docs + periodic: + - periodic-heat-docs-stable-grizzly + - periodic-heat-python26-stable-grizzly + - periodic-heat-python27-stable-grizzly - name: openstack/python-heatclient check: @@ -1606,6 +1667,8 @@ projects: - openstack-security-guide - manuals-upstream-translation-update - openstack-training + periodic: + - manuals-propose-translation-update - name: openstack/operations-guide check: @@ -1704,6 +1767,8 @@ projects: - gate-gitdm gate: - gate-gitdm + periodic: + - periodic-gitdm - name: openstack-infra/git-review check: