puppet: use gerrit-git-prep for all jobs

Stop using zuul-clone macro because the other-requirements.txt was not
found by install-distro-packages.sh script, since it looks at the root
of the workspace.
By using gerrit-git-prep, we have the repo directly at the root of the
workspace, other-requirements.txt will be found and we'll unblock our
CI, that is currently broken because some packages are installed by
default bindep packages.

Change-Id: I5be52b5790655d4361817890f2bf4af382924e2c
This commit is contained in:
Emilien Macchi 2016-04-14 22:18:00 -04:00
parent ba8fd64f50
commit 0d60a1572d

@ -191,11 +191,11 @@
- print-template-name:
template-name: "{template-name}"
- link-logs
- zuul-clone:
project: openstack/puppet-openstack-integration
- gerrit-git-prep
- install-distro-packages
- puppet-prepare-node
- shell: |
#!/bin/bash -xe
cd openstack/puppet-openstack-integration
./run_multinode.sh
wrappers:
@ -216,15 +216,13 @@
- print-template-name:
template-name: "{template-name}"
- link-logs
- zuul-clone:
project: openstack/puppet-openstack-integration
- gerrit-git-prep
- install-distro-packages
- puppet-prepare-node
- shell: |
#!/bin/bash -xe
export PUPPET_VERSION={puppet_version}
export SCENARIO={scenario}
cd openstack/puppet-openstack-integration
mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems
gem install bundler --no-rdoc --no-ri --verbose
@ -248,13 +246,11 @@
- print-template-name:
template-name: "{template-name}"
- link-logs
- zuul-clone:
project: openstack/puppet-openstack_spec_helper
- gerrit-git-prep
- install-distro-packages
- puppet-prepare-node
- shell: |
#!/bin/bash -xe
cd openstack/puppet-openstack_spec_helper
./run_unit_tests.sh
wrappers:
@ -273,14 +269,12 @@
- print-template-name:
template-name: "{template-name}"
- link-logs
- zuul-clone:
project: openstack/puppet-openstack_spec_helper
- gerrit-git-prep
- install-distro-packages
- puppet-prepare-node
- allow-local-ssh-root
- shell: |
#!/bin/bash -xe
cd openstack/puppet-openstack_spec_helper
./run_beaker_tests.sh
wrappers: