From acf7572d10e104713628745d6ef706c72c772835 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 3 Apr 2017 19:36:51 +0200 Subject: [PATCH] s/gerrit-git-prep/zuul-git-prep/g We do not need gerrit-git-prep anymore, zuul-git-prep works on all our slaves and has the advantage of using zuul-cloner so that the local cache is used and Depends-On works. Remove gerrit-git-prep and use zuul-git-prep instead everywhere. Change-Id: I2f106af58f78fceaf3c497fe43e6f5a002695645 --- jenkins/jobs/ansible-role-jobs.yaml | 2 +- jenkins/jobs/api-jobs.yaml | 6 +++--- jenkins/jobs/ara.yaml | 2 +- jenkins/jobs/astara.yaml | 2 +- jenkins/jobs/beaker-jobs.yaml | 2 +- jenkins/jobs/chef-jobs.yaml | 2 +- jenkins/jobs/deb-auto-backports.yaml | 4 ++-- jenkins/jobs/deb-build-pkg.yaml | 4 ++-- jenkins/jobs/deb-openstack-pkg-tools.yaml | 4 ++-- jenkins/jobs/devstack.yaml | 2 +- jenkins/jobs/elastic-recheck.yaml | 2 +- jenkins/jobs/gitdm.yaml | 2 +- jenkins/jobs/groups.yaml | 4 ++-- jenkins/jobs/infra-publications.yaml | 4 ++-- jenkins/jobs/infra-publish-jobs.yaml | 8 ++++---- jenkins/jobs/infra.yaml | 20 ++++++++++---------- jenkins/jobs/ironic-python-agent-jobs.yaml | 2 +- jenkins/jobs/javascript.yaml | 16 ++++++++-------- jenkins/jobs/jenkins-plugin-jobs.yaml | 4 ++-- jenkins/jobs/liberasurecode.yaml | 2 +- jenkins/jobs/macros.yaml | 16 ---------------- jenkins/jobs/manila.yaml | 6 +++--- jenkins/jobs/maven-plugin-jobs.yaml | 2 +- jenkins/jobs/misc.yaml | 4 ++-- jenkins/jobs/mistral.yaml | 2 +- jenkins/jobs/openstack-ansible-jobs.yaml | 2 +- jenkins/jobs/openstack-planet.yaml | 2 +- jenkins/jobs/openstackid.yaml | 4 ++-- jenkins/jobs/osc.yaml | 2 +- jenkins/jobs/packstack.yaml | 2 +- jenkins/jobs/project-team-guide.yaml | 2 +- jenkins/jobs/puppet-module-jobs.yaml | 12 ++++++------ jenkins/jobs/pypi-jobs.yaml | 2 +- jenkins/jobs/python-jobs.yaml | 4 ++-- jenkins/jobs/rally.yaml | 2 +- jenkins/jobs/release-jobs.yaml | 4 ++-- jenkins/jobs/requirements.yaml | 2 +- jenkins/jobs/rst2bash.yaml | 2 +- jenkins/jobs/sahara.yaml | 6 +++--- jenkins/jobs/signing-jobs.yaml | 2 +- jenkins/jobs/specs-jobs.yaml | 4 ++-- jenkins/jobs/static-publish-jobs.yaml | 2 +- jenkins/jobs/storlets.yaml | 2 +- jenkins/jobs/storyboard.yaml | 2 +- jenkins/jobs/training-labs.yaml | 4 ++-- jenkins/jobs/xstatic.yaml | 2 +- 46 files changed, 87 insertions(+), 103 deletions(-) diff --git a/jenkins/jobs/ansible-role-jobs.yaml b/jenkins/jobs/ansible-role-jobs.yaml index f3a7e0253e..4ad88e8a91 100644 --- a/jenkins/jobs/ansible-role-jobs.yaml +++ b/jenkins/jobs/ansible-role-jobs.yaml @@ -3,7 +3,7 @@ node: 'ubuntu-trusty' builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - ansible-prep - ansible-lint-prep diff --git a/jenkins/jobs/api-jobs.yaml b/jenkins/jobs/api-jobs.yaml index 215c651d41..01901f5c99 100644 --- a/jenkins/jobs/api-jobs.yaml +++ b/jenkins/jobs/api-jobs.yaml @@ -3,7 +3,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -24,7 +24,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -189,7 +189,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - docs diff --git a/jenkins/jobs/ara.yaml b/jenkins/jobs/ara.yaml index a9ef09ecea..e2fdc74bb5 100644 --- a/jenkins/jobs/ara.yaml +++ b/jenkins/jobs/ara.yaml @@ -5,7 +5,7 @@ - print-template-name: template-name: "{template-name}" - link-logs - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe diff --git a/jenkins/jobs/astara.yaml b/jenkins/jobs/astara.yaml index 2f8a15cc4b..be81966331 100644 --- a/jenkins/jobs/astara.yaml +++ b/jenkins/jobs/astara.yaml @@ -84,7 +84,7 @@ builders: - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - diskimage-builder-install - shell: | diff --git a/jenkins/jobs/beaker-jobs.yaml b/jenkins/jobs/beaker-jobs.yaml index a8cf8e7b98..8728e57a7c 100644 --- a/jenkins/jobs/beaker-jobs.yaml +++ b/jenkins/jobs/beaker-jobs.yaml @@ -5,7 +5,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - bundle-install diff --git a/jenkins/jobs/chef-jobs.yaml b/jenkins/jobs/chef-jobs.yaml index 2e8625da16..e3cb9eb6e5 100644 --- a/jenkins/jobs/chef-jobs.yaml +++ b/jenkins/jobs/chef-jobs.yaml @@ -12,7 +12,7 @@ builders: - print-template-name: template-name: '{template-name}' - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - chef-bootstrap - revoke-sudo diff --git a/jenkins/jobs/deb-auto-backports.yaml b/jenkins/jobs/deb-auto-backports.yaml index ce4c1db461..a06d379aec 100644 --- a/jenkins/jobs/deb-auto-backports.yaml +++ b/jenkins/jobs/deb-auto-backports.yaml @@ -8,7 +8,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - shell: | #!/bin/bash BRANCH=$(echo $ZUUL_REFNAME | cut -d/ -f2) @@ -36,7 +36,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - shell: | #!/bin/bash BRANCH=$(echo $ZUUL_REFNAME | cut -d/ -f2) diff --git a/jenkins/jobs/deb-build-pkg.yaml b/jenkins/jobs/deb-build-pkg.yaml index 77f8b67b30..db101e4317 100644 --- a/jenkins/jobs/deb-build-pkg.yaml +++ b/jenkins/jobs/deb-build-pkg.yaml @@ -25,7 +25,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - pkgos-infra-build-pkg publishers: @@ -41,7 +41,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - pkgos-infra-build-pkg publishers: diff --git a/jenkins/jobs/deb-openstack-pkg-tools.yaml b/jenkins/jobs/deb-openstack-pkg-tools.yaml index 50e0ef5f76..44c0f6685a 100644 --- a/jenkins/jobs/deb-openstack-pkg-tools.yaml +++ b/jenkins/jobs/deb-openstack-pkg-tools.yaml @@ -8,7 +8,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - shell: | #!/bin/bash @@ -35,7 +35,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - shell: | #!/bin/bash diff --git a/jenkins/jobs/devstack.yaml b/jenkins/jobs/devstack.yaml index b0901fd7cd..5d7268808a 100644 --- a/jenkins/jobs/devstack.yaml +++ b/jenkins/jobs/devstack.yaml @@ -5,7 +5,7 @@ node: ubuntu-trusty builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe diff --git a/jenkins/jobs/elastic-recheck.yaml b/jenkins/jobs/elastic-recheck.yaml index a53548c161..24015c5ff5 100644 --- a/jenkins/jobs/elastic-recheck.yaml +++ b/jenkins/jobs/elastic-recheck.yaml @@ -3,7 +3,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - docs diff --git a/jenkins/jobs/gitdm.yaml b/jenkins/jobs/gitdm.yaml index d59badebe8..4c2d79eae4 100644 --- a/jenkins/jobs/gitdm.yaml +++ b/jenkins/jobs/gitdm.yaml @@ -4,7 +4,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - link-logs diff --git a/jenkins/jobs/groups.yaml b/jenkins/jobs/groups.yaml index ccd7b47116..852e01f0e9 100644 --- a/jenkins/jobs/groups.yaml +++ b/jenkins/jobs/groups.yaml @@ -3,7 +3,7 @@ node: ubuntu-trusty builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: | @@ -30,7 +30,7 @@ node: ubuntu-trusty builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: | diff --git a/jenkins/jobs/infra-publications.yaml b/jenkins/jobs/infra-publications.yaml index 1c82a74173..8cd9e6bc56 100644 --- a/jenkins/jobs/infra-publications.yaml +++ b/jenkins/jobs/infra-publications.yaml @@ -4,7 +4,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - add-docs-root-marker: @@ -35,7 +35,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: | diff --git a/jenkins/jobs/infra-publish-jobs.yaml b/jenkins/jobs/infra-publish-jobs.yaml index dc018fa2b5..f8c1cf383b 100644 --- a/jenkins/jobs/infra-publish-jobs.yaml +++ b/jenkins/jobs/infra-publish-jobs.yaml @@ -5,7 +5,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - docs @@ -26,7 +26,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - docs-tags-only-env: @@ -46,7 +46,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -68,7 +68,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml index 4ab0479278..074adb5656 100644 --- a/jenkins/jobs/infra.yaml +++ b/jenkins/jobs/infra.yaml @@ -4,7 +4,7 @@ builders: - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -20,7 +20,7 @@ builders: - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -36,7 +36,7 @@ builders: - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -52,7 +52,7 @@ builders: - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -68,7 +68,7 @@ builders: - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -84,7 +84,7 @@ builders: - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -239,7 +239,7 @@ builders: - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -279,7 +279,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -315,7 +315,7 @@ builders: - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: @@ -332,7 +332,7 @@ builders: - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: diff --git a/jenkins/jobs/ironic-python-agent-jobs.yaml b/jenkins/jobs/ironic-python-agent-jobs.yaml index 141d6d7396..a70e2d13f5 100644 --- a/jenkins/jobs/ironic-python-agent-jobs.yaml +++ b/jenkins/jobs/ironic-python-agent-jobs.yaml @@ -5,7 +5,7 @@ builders: - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe diff --git a/jenkins/jobs/javascript.yaml b/jenkins/jobs/javascript.yaml index 1f58c52632..6d62f9ca02 100644 --- a/jenkins/jobs/javascript.yaml +++ b/jenkins/jobs/javascript.yaml @@ -34,7 +34,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - nodejs-install: version: '{version}' @@ -77,7 +77,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - nodejs-install: version: "{version}" @@ -113,7 +113,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - nodejs-install: version: '{version}' @@ -152,7 +152,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - nodejs-install: version: '{version}' @@ -173,7 +173,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - nodejs-install: version: '{version}' @@ -200,7 +200,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - nodejs-install: version: '{version}' @@ -288,7 +288,7 @@ template-name: "{template-name}" - nodejs-install: version: 4 - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - js-build: @@ -325,7 +325,7 @@ template-name: "{template-name}" - nodejs-install: version: 4 - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - js-build: diff --git a/jenkins/jobs/jenkins-plugin-jobs.yaml b/jenkins/jobs/jenkins-plugin-jobs.yaml index a1ce0e69ab..ab43f381e8 100644 --- a/jenkins/jobs/jenkins-plugin-jobs.yaml +++ b/jenkins/jobs/jenkins-plugin-jobs.yaml @@ -11,7 +11,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: | @@ -33,7 +33,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: | diff --git a/jenkins/jobs/liberasurecode.yaml b/jenkins/jobs/liberasurecode.yaml index 27c85bdd7b..c1c60f4707 100644 --- a/jenkins/jobs/liberasurecode.yaml +++ b/jenkins/jobs/liberasurecode.yaml @@ -3,7 +3,7 @@ node: '{node}' builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml index 3ab18d4f01..7328a99205 100644 --- a/jenkins/jobs/macros.yaml +++ b/jenkins/jobs/macros.yaml @@ -10,22 +10,6 @@ builders: - shell: 'echo JJB template: {template-name}' -- builder: - name: gerrit-git-prep - builders: - - shell: | - #!/bin/bash - count=0 - until /usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org ; do - echo "git failed, retrying" - count=$(($count + 1)) - if [ $count -eq 3 ]; then - echo "Maximum of 3 git retries reached" - exit 1 - fi - sleep 5 - done - - builder: name: zuul-git-prep builders: diff --git a/jenkins/jobs/manila.yaml b/jenkins/jobs/manila.yaml index 0ede2976ac..9f115fdf00 100644 --- a/jenkins/jobs/manila.yaml +++ b/jenkins/jobs/manila.yaml @@ -312,7 +312,7 @@ builders: - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe @@ -339,7 +339,7 @@ builders: - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe @@ -360,7 +360,7 @@ builders: - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe diff --git a/jenkins/jobs/maven-plugin-jobs.yaml b/jenkins/jobs/maven-plugin-jobs.yaml index 069b5779c9..9f9f5180b4 100644 --- a/jenkins/jobs/maven-plugin-jobs.yaml +++ b/jenkins/jobs/maven-plugin-jobs.yaml @@ -11,7 +11,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: | diff --git a/jenkins/jobs/misc.yaml b/jenkins/jobs/misc.yaml index c375bde78b..eacef4dc67 100644 --- a/jenkins/jobs/misc.yaml +++ b/jenkins/jobs/misc.yaml @@ -18,7 +18,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tests @@ -62,7 +62,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo diff --git a/jenkins/jobs/mistral.yaml b/jenkins/jobs/mistral.yaml index 9aa34c41a1..443f85d623 100644 --- a/jenkins/jobs/mistral.yaml +++ b/jenkins/jobs/mistral.yaml @@ -48,7 +48,7 @@ builders: - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | ./docker_image_build.sh diff --git a/jenkins/jobs/openstack-ansible-jobs.yaml b/jenkins/jobs/openstack-ansible-jobs.yaml index 09218352a8..b90322ccf6 100644 --- a/jenkins/jobs/openstack-ansible-jobs.yaml +++ b/jenkins/jobs/openstack-ansible-jobs.yaml @@ -10,7 +10,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - shell: | #!/bin/bash -xe sudo scripts/gate-check-commit.sh "{scenario}" diff --git a/jenkins/jobs/openstack-planet.yaml b/jenkins/jobs/openstack-planet.yaml index 525901b3e1..361edc1b9d 100644 --- a/jenkins/jobs/openstack-planet.yaml +++ b/jenkins/jobs/openstack-planet.yaml @@ -4,7 +4,7 @@ node: ubuntu-trusty builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: | diff --git a/jenkins/jobs/openstackid.yaml b/jenkins/jobs/openstackid.yaml index 0538e1b644..226d2afff0 100644 --- a/jenkins/jobs/openstackid.yaml +++ b/jenkins/jobs/openstackid.yaml @@ -3,7 +3,7 @@ node: ubuntu-trusty builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe @@ -28,7 +28,7 @@ node: ubuntu-trusty builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe diff --git a/jenkins/jobs/osc.yaml b/jenkins/jobs/osc.yaml index e348017fe0..0144bdfb47 100644 --- a/jenkins/jobs/osc.yaml +++ b/jenkins/jobs/osc.yaml @@ -119,7 +119,7 @@ node: ubuntu-trusty builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - link-logs diff --git a/jenkins/jobs/packstack.yaml b/jenkins/jobs/packstack.yaml index 0b60283945..dc4934b028 100644 --- a/jenkins/jobs/packstack.yaml +++ b/jenkins/jobs/packstack.yaml @@ -6,7 +6,7 @@ - print-template-name: template-name: "{template-name}" - link-logs - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - puppet-prepare-node - shell: | diff --git a/jenkins/jobs/project-team-guide.yaml b/jenkins/jobs/project-team-guide.yaml index 2844505359..4071dde59b 100644 --- a/jenkins/jobs/project-team-guide.yaml +++ b/jenkins/jobs/project-team-guide.yaml @@ -3,7 +3,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - docs diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml index 1343f0d5f7..23efe54f1d 100644 --- a/jenkins/jobs/puppet-module-jobs.yaml +++ b/jenkins/jobs/puppet-module-jobs.yaml @@ -34,7 +34,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - puppet-prepare-node - revoke-sudo @@ -65,7 +65,7 @@ - print-template-name: template-name: "{template-name}" - link-logs - - gerrit-git-prep + - zuul-git-prep - puppet-openstack-integration-checkout - install-distro-packages - puppet-prepare-node @@ -104,7 +104,7 @@ - print-template-name: template-name: "{template-name}" - revoke-sudo - - gerrit-git-prep + - zuul-git-prep - shell: | #!/bin/bash cat > Rakefile << EOF @@ -128,7 +128,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - puppet-prepare-node - revoke-sudo @@ -144,7 +144,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - puppet-syntax @@ -159,7 +159,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - puppet-prepare-node - revoke-sudo diff --git a/jenkins/jobs/pypi-jobs.yaml b/jenkins/jobs/pypi-jobs.yaml index 2d4f7fd813..e3aa4d4c85 100644 --- a/jenkins/jobs/pypi-jobs.yaml +++ b/jenkins/jobs/pypi-jobs.yaml @@ -4,7 +4,7 @@ builders: - revoke-sudo - - gerrit-git-prep + - zuul-git-prep - shell: | # Note we upload the wheel first because pip prefers wheels # and there is a mirroring issue where sometimes the first diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml index bb169fff0a..043322fcfb 100644 --- a/jenkins/jobs/python-jobs.yaml +++ b/jenkins/jobs/python-jobs.yaml @@ -449,7 +449,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: | @@ -468,7 +468,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index 5823b08e5a..581e940dfb 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -4,7 +4,7 @@ builders: - link-logs - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: "tests/ci/test_install.sh" diff --git a/jenkins/jobs/release-jobs.yaml b/jenkins/jobs/release-jobs.yaml index ac79841aca..33e5c7a066 100644 --- a/jenkins/jobs/release-jobs.yaml +++ b/jenkins/jobs/release-jobs.yaml @@ -4,7 +4,7 @@ node: signing builders: - - gerrit-git-prep + - zuul-git-prep - revoke-sudo - shell: | #!/bin/bash -ex @@ -34,7 +34,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - revoke-sudo - shell: | #!/bin/bash diff --git a/jenkins/jobs/requirements.yaml b/jenkins/jobs/requirements.yaml index 8dcb205a16..e1e07e0657 100644 --- a/jenkins/jobs/requirements.yaml +++ b/jenkins/jobs/requirements.yaml @@ -266,7 +266,7 @@ - revoke-sudo - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - shell: /usr/local/jenkins/slave_scripts/propose_update.sh requirements publishers: diff --git a/jenkins/jobs/rst2bash.yaml b/jenkins/jobs/rst2bash.yaml index 7c5a8cc266..aeefa31180 100644 --- a/jenkins/jobs/rst2bash.yaml +++ b/jenkins/jobs/rst2bash.yaml @@ -3,7 +3,7 @@ node: 'ubuntu-xenial' builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: #!/bin/bash -xe diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml index db6a940294..ee1438acc1 100644 --- a/jenkins/jobs/sahara.yaml +++ b/jenkins/jobs/sahara.yaml @@ -57,7 +57,7 @@ builders: - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - shell: | #!/bin/bash -xe @@ -105,7 +105,7 @@ builders: - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - sahara-extra-build @@ -125,7 +125,7 @@ builders: - link-logs - net-info - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - sahara-extra-build diff --git a/jenkins/jobs/signing-jobs.yaml b/jenkins/jobs/signing-jobs.yaml index 5d52973a6a..d191eba2f5 100644 --- a/jenkins/jobs/signing-jobs.yaml +++ b/jenkins/jobs/signing-jobs.yaml @@ -6,7 +6,7 @@ - print-template-name: template-name: "{template-name}" - revoke-sudo - - gerrit-git-prep + - zuul-git-prep - shell: | /usr/local/jenkins/slave_scripts/tarball-signing.sh {name} \ tarballs.openstack.org diff --git a/jenkins/jobs/specs-jobs.yaml b/jenkins/jobs/specs-jobs.yaml index 28ac3f7246..00a291388f 100644 --- a/jenkins/jobs/specs-jobs.yaml +++ b/jenkins/jobs/specs-jobs.yaml @@ -10,7 +10,7 @@ builders: - print-template-name: template-name: "{template-name}" - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - docs: @@ -42,7 +42,7 @@ name: generate-specs-site builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - run-tox: diff --git a/jenkins/jobs/static-publish-jobs.yaml b/jenkins/jobs/static-publish-jobs.yaml index fe39895a3b..ac6ed87d29 100644 --- a/jenkins/jobs/static-publish-jobs.yaml +++ b/jenkins/jobs/static-publish-jobs.yaml @@ -5,7 +5,7 @@ node: ubuntu-xenial builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - docs: diff --git a/jenkins/jobs/storlets.yaml b/jenkins/jobs/storlets.yaml index fbb637f32d..15e9d9bc05 100644 --- a/jenkins/jobs/storlets.yaml +++ b/jenkins/jobs/storlets.yaml @@ -3,7 +3,7 @@ node: '{node}' builders: - - gerrit-git-prep + - zuul-git-prep - shell: | #!/bin/bash -xe tests/setup_functional_test.sh diff --git a/jenkins/jobs/storyboard.yaml b/jenkins/jobs/storyboard.yaml index 25d69dce5f..3857946e24 100644 --- a/jenkins/jobs/storyboard.yaml +++ b/jenkins/jobs/storyboard.yaml @@ -8,7 +8,7 @@ - timestamps builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - nodejs-install: version: 4 diff --git a/jenkins/jobs/training-labs.yaml b/jenkins/jobs/training-labs.yaml index cbb5b925c7..70f77d1713 100644 --- a/jenkins/jobs/training-labs.yaml +++ b/jenkins/jobs/training-labs.yaml @@ -3,7 +3,7 @@ node: '{node}' builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: @@ -25,7 +25,7 @@ node: '{node}' builders: - - gerrit-git-prep + - zuul-git-prep - install-distro-packages - revoke-sudo - shell: diff --git a/jenkins/jobs/xstatic.yaml b/jenkins/jobs/xstatic.yaml index 084fab1efb..0ebf4dc31d 100644 --- a/jenkins/jobs/xstatic.yaml +++ b/jenkins/jobs/xstatic.yaml @@ -4,7 +4,7 @@ builders: - revoke-sudo - - gerrit-git-prep + - zuul-git-prep - shell: | virtualenv .venv source .venv/bin/activate