Use bindep in thin worker experimental job

Update the experimental nova Python 2.7 unit test job which runs on
thin "ubuntu-trusty" workers to use bindep for determining its
distro package dependencies, and rename it to something more
appropriate now that it's not actually using devstack-trusty workers
any longer. Also switch it from gerrit-git-prep to the new
zuul-git-prep builder macro, and while at it adjust zuul-git-prep to
have a zuul-branch-git-prep variant rather than requiring a branch
parameter for the more common case.

Change-Id: Ib3f4844c1203f8a3890d9e5d91347d4507b5d08b

jenkins/jobs/experimental-workers.yaml

@@ -1,5 +1,5 @@
 - job:
-    name: experimental-nova-dsvm-python27
+    name: bindep-nova-python27
 
     wrappers:
       - build-timeout:
@@ -7,7 +7,8 @@
       - timestamps
 
     builders:
-      - base-packages-trusty
+      - zuul-git-prep
+      - install-distro-packages
       - mysql-prep
       - pgsql-prep
       - mysql-db:
@@ -15,7 +16,6 @@
       - pgsql-db:
           db_name: openstack_citest
       - revoke-sudo
-      - gerrit-git-prep
       - python27
       - assert-no-extra-files
 
@@ -24,4 +24,3 @@
       - console-log
 
     node: ubuntu-trusty
-

jenkins/jobs/macros.yaml

@@ -23,6 +23,19 @@
 
 - builder:
     name: zuul-git-prep
+    builders:
+      - shell: |
+          #!/bin/bash -xe
+          cat > clonemap.yaml << EOF
+          clonemap:
+            - name: $ZUUL_PROJECT
+              dest: .
+          EOF
+          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
+              git://git.openstack.org $ZUUL_PROJECT
+
+- builder:
+    name: zuul-git-branch-prep
     builders:
       - shell: |
           #!/bin/bash -xe
@@ -39,8 +52,7 @@
               export ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              $ZUUL_PROJECT
+              git://git.openstack.org $ZUUL_PROJECT
 
 - builder:
     name: branch-git-prep
@@ -477,24 +489,30 @@
           ip neighbor show
 
 - builder:
-    name: base-packages-trusty
+    name: install-distro-packages
     builders:
       - shell: |
           #!/bin/bash -xe
-          sudo apt-get update
-          sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \
-              apt-get --option "Dpkg::Options::=--force-confold" --assume-yes \
-              install \
-                  build-essential \
-                  python-dev \
-                  mysql-client \
-                  mysql-server \
-                  libmysqlclient-dev \
-                  postgresql-client \
-                  postgresql \
-                  libpq-dev \
-                  libffi-dev \
-                  libxslt-dev \
+          if [ -e other-requirements.txt ] ; then
+              export DISTRO_PACKAGES=other-requirements.txt
+          else
+              mkdir -p .test
+              pushd .test
+              /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
+                  git://git.openstack.org openstack-infra/project-config
+              popd
+              export DISTRO_PACKAGES=.test/openstack-infra/project-config/jenkins/data/bindep-fallback.txt
+          fi
+          if apt-get -v >/dev/null ; then
+              sudo apt-get update
+              sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \
+                  apt-get --option "Dpkg::Options::=--force-confold" \
+                  --assume-yes install \
+                  `/usr/bindep-env/bin/bindep -b -f $DISTRO_PACKAGES || true`
+          else
+              sudo PATH=/usr/sbin:/sbin:$PATH yum install -y \
+                  `/usr/bindep-env/bin/bindep -b -f $DISTRO_PACKAGES || true`
+          fi
 
 - builder:
     name: mysql-prep

zuul/layout.yaml

@@ -2381,7 +2381,7 @@ projects:
       - check-tempest-dsvm-nova-wsgi-full
       - check-tempest-dsvm-neutron-multinode-full
       - check-tempest-dsvm-neutron-dvr-multinode-full
-      - experimental-nova-dsvm-python27
+      - bindep-nova-python27
       - check-tempest-dsvm-f21
 
 

zuul/openstack_functions.py

@@ -45,7 +45,7 @@ def devstack_params(item, job, params):
     # Remove this when we are done doing prelimindary dib testing.
     if 'icehouse-dibtest' in job.name:
         params['ZUUL_NODE'] = 'devstack-precise-dib'
-    elif 'dibtest' in job.name or 'experimental-nova-dsvm-python27' in job.name:
+    elif 'dibtest' in job.name or 'bindep-nova-python27' in job.name:
         params['ZUUL_NODE'] = 'ubuntu-trusty'
     elif ((hasattr(change, 'branch') and
             change.branch == 'stable/icehouse') or