diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
index 32e207ce..2b2a3bc8 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
@@ -43,7 +43,7 @@
           # use the larger mounted space.
           cd ~
           sudo mkdir /opt/dib_cache
-          sudo chown jenkins:jenkins /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
           export DIB_NO_TMPFS=1
           export TMPDIR=/opt/dib_cache
 
@@ -69,7 +69,10 @@
           set +u
           source ./env/bin/activate
           set -u
-          ./openstack/diskimage-builder/tests/run_functests.sh gentoo/build-succeeds debian-minimal/stable-vm
+
+          ./openstack/diskimage-builder/tests/run_functests.sh \
+            gentoo/build-succeeds \
+            debian-minimal/stable-vm
 
           set +u
           deactivate
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
index 5978d1b2..f54176ca 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
@@ -43,7 +43,7 @@
           # use the larger mounted space.
           cd ~
           sudo mkdir /opt/dib_cache
-          sudo chown jenkins:jenkins /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
           export DIB_NO_TMPFS=1
           export TMPDIR=/opt/dib_cache
 
@@ -69,7 +69,13 @@
           set +u
           source ./env/bin/activate
           set -u
-          ./openstack/diskimage-builder/tests/run_functests.sh centos7/build-succeeds opensuse/build-succeeds opensuse/opensuse423-build-succeeds fedora/build-succeeds ubuntu/trusty-build-succeeds ubuntu/xenial-build-succeeds
+          ./openstack/diskimage-builder/tests/run_functests.sh \
+            centos7/build-succeeds \
+            opensuse/build-succeeds \
+            opensuse/opensuse423-build-succeeds \
+            fedora/build-succeeds \
+            ubuntu/trusty-build-succeeds \
+            ubuntu/xenial-build-succeeds
 
           set +u
           deactivate
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
index 4dbf3ed4..3ea53443 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
@@ -34,20 +34,45 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
-        cmd: "set -u\nset -e\nset -x\n#\n# We do things that might exceed the default\
-          \ 2GiB tmpfs, and\n# use the larger mounted space.\ncd ~\nsudo mkdir /opt/dib_cache\n\
-          sudo chown jenkins:jenkins /opt/dib_cache\nexport DIB_NO_TMPFS=1\nexport\
-          \ TMPDIR=/opt/dib_cache\n\nvirtualenv -p python2 env\n\nexport UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt\n\
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE\n./env/bin/pip install\
-          \ $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE\n\n# TODO(pabelanger):\
-          \ Remove once we migrated to bindep\n./openstack/diskimage-builder/tests/install_test_deps.sh\n\
-          \n# This sets up some repo files pointing to the infra mirrors\n# which\
-          \ are used during test runs\n./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh\n\
-          \n# UPPER_CONSTRAINTS_FILE is causing side effects when doing image\n# build,\
-          \ unset it\nunset UPPER_CONSTRAINTS_FILE\n\n# activate the virtualenv so\
-          \ that any tools run by dib run\n# using the python inside it\nset +u\n\
-          source ./env/bin/activate\nset -u\n./openstack/diskimage-builder/tests/run_functests.sh\
-          \ \nset +u\ndeactivate\nset -u\n"
+        cmd: |
+          set -u
+          set -e
+          set -x
+          #
+          # We do things that might exceed the default 2GiB tmpfs, and
+          # use the larger mounted space.
+          cd ~
+          sudo mkdir /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
+          export DIB_NO_TMPFS=1
+          export TMPDIR=/opt/dib_cache
+
+          virtualenv -p python2 env
+
+          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
+          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
+          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
+          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
+          # build, unset it
+          unset UPPER_CONSTRAINTS_FILE
+
+          # TODO(pabelanger): Remove once we migrated to bindep
+          ./openstack/diskimage-builder/tests/install_test_deps.sh
+
+          # This sets up some repo files pointing to the infra mirrors
+          # which are used during test runs
+          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
+
+          # activate the virtualenv so that any tools run by dib run
+          # using the python inside it
+          set +u
+          source ./env/bin/activate
+          set -u
+          ./openstack/diskimage-builder/tests/run_functests.sh
+          set +u
+          deactivate
+          set -u
+
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml
index 09649cdd..ef67e2a9 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-opensuse-423/run.yaml
@@ -34,20 +34,48 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
-        cmd: "set -u\nset -e\nset -x\n#\n# We do things that might exceed the default\
-          \ 2GiB tmpfs, and\n# use the larger mounted space.\ncd ~\nsudo mkdir /opt/dib_cache\n\
-          sudo chown jenkins:jenkins /opt/dib_cache\nexport DIB_NO_TMPFS=1\nexport\
-          \ TMPDIR=/opt/dib_cache\n\nvirtualenv -p python2 env\n\nexport UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt\n\
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE\n./env/bin/pip install\
-          \ $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE\n\n# TODO(pabelanger):\
-          \ Remove once we migrated to bindep\n./openstack/diskimage-builder/tests/install_test_deps.sh\n\
-          \n# This sets up some repo files pointing to the infra mirrors\n# which\
-          \ are used during test runs\n./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh\n\
-          \n# UPPER_CONSTRAINTS_FILE is causing side effects when doing image\n# build,\
-          \ unset it\nunset UPPER_CONSTRAINTS_FILE\n\n# activate the virtualenv so\
-          \ that any tools run by dib run\n# using the python inside it\nset +u\n\
-          source ./env/bin/activate\nset -u\n./openstack/diskimage-builder/tests/run_functests.sh\
-          \ \nset +u\ndeactivate\nset -u\n"
+        cmd: |
+          set -u
+          set -e
+          set -x
+          #
+          # We do things that might exceed the default 2GiB tmpfs, and
+          # use the larger mounted space.
+          cd ~
+          sudo mkdir /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
+          export DIB_NO_TMPFS=1
+          export TMPDIR=/opt/dib_cache
+
+          virtualenv -p python2 env
+
+          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
+          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
+          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
+
+          # TODO(pabelanger): Remove once we migrated to bindep
+          ./openstack/diskimage-builder/tests/install_test_deps.sh
+
+          # This sets up some repo files pointing to the infra mirrors
+          # which are used during test runs
+          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
+
+          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
+          # build, unset it
+          unset UPPER_CONSTRAINTS_FILE
+
+          # activate the virtualenv so that any tools run by dib run
+          # using the python inside it
+          set +u
+          source ./env/bin/activate
+          set -u
+
+          ./openstack/diskimage-builder/tests/run_functests.sh
+
+          set +u
+          deactivate
+          set -u
+
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
index d25a6af7..da955d04 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
@@ -43,7 +43,7 @@
           # use the larger mounted space.
           cd ~
           sudo mkdir /opt/dib_cache
-          sudo chown jenkins:jenkins /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
           export DIB_NO_TMPFS=1
           export TMPDIR=/opt/dib_cache
 
@@ -69,7 +69,10 @@
           set +u
           source ./env/bin/activate
           set -u
-          ./openstack/diskimage-builder/tests/run_functests.sh gentoo/build-succeeds debian-minimal/stable-vm
+
+          ./openstack/diskimage-builder/tests/run_functests.sh \
+            gentoo/build-succeeds \
+            debian-minimal/stable-vm
 
           set +u
           deactivate
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
index f6a5da2d..736179dd 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
@@ -43,7 +43,7 @@
           # use the larger mounted space.
           cd ~
           sudo mkdir /opt/dib_cache
-          sudo chown jenkins:jenkins /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
           export DIB_NO_TMPFS=1
           export TMPDIR=/opt/dib_cache
 
@@ -69,7 +69,14 @@
           set +u
           source ./env/bin/activate
           set -u
-          ./openstack/diskimage-builder/tests/run_functests.sh centos7/build-succeeds opensuse/build-succeeds opensuse/opensuse423-build-succeeds fedora/build-succeeds ubuntu/trusty-build-succeeds ubuntu/xenial-build-succeeds
+
+          ./openstack/diskimage-builder/tests/run_functests.sh \
+            centos7/build-succeeds \
+            opensuse/build-succeeds \
+            opensuse/opensuse423-build-succeeds \
+            fedora/build-succeeds \
+            ubuntu/trusty-build-succeeds \
+            ubuntu/xenial-build-succeeds
 
           set +u
           deactivate
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
index 72a2b40f..5ebe0bcd 100644
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
@@ -34,20 +34,48 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
-        cmd: "set -u\nset -e\nset -x\n#\n# We do things that might exceed the default\
-          \ 2GiB tmpfs, and\n# use the larger mounted space.\ncd ~\nsudo mkdir /opt/dib_cache\n\
-          sudo chown jenkins:jenkins /opt/dib_cache\nexport DIB_NO_TMPFS=1\nexport\
-          \ TMPDIR=/opt/dib_cache\n\nvirtualenv -p python2 env\n\nexport UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt\n\
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE\n./env/bin/pip install\
-          \ $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE\n\n# TODO(pabelanger):\
-          \ Remove once we migrated to bindep\n./openstack/diskimage-builder/tests/install_test_deps.sh\n\
-          \n# This sets up some repo files pointing to the infra mirrors\n# which\
-          \ are used during test runs\n./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh\n\
-          \n# UPPER_CONSTRAINTS_FILE is causing side effects when doing image\n# build,\
-          \ unset it\nunset UPPER_CONSTRAINTS_FILE\n\n# activate the virtualenv so\
-          \ that any tools run by dib run\n# using the python inside it\nset +u\n\
-          source ./env/bin/activate\nset -u\n./openstack/diskimage-builder/tests/run_functests.sh\
-          \ \nset +u\ndeactivate\nset -u\n"
+        cmd: |
+          set -u
+          set -e
+          set -x
+          #
+          # We do things that might exceed the default 2GiB tmpfs, and
+          # use the larger mounted space.
+          cd ~
+          sudo mkdir /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
+          export DIB_NO_TMPFS=1
+          export TMPDIR=/opt/dib_cache
+
+          virtualenv -p python2 env
+
+          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
+          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
+          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
+
+          # TODO(pabelanger): Remove once we migrated to bindep
+          ./openstack/diskimage-builder/tests/install_test_deps.sh
+
+          # This sets up some repo files pointing to the infra mirrors
+          # which are used during test runs
+          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
+
+          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
+          # build, unset it
+          unset UPPER_CONSTRAINTS_FILE
+
+          # activate the virtualenv so that any tools run by dib run
+          # using the python inside it
+          set +u
+          source ./env/bin/activate
+          set -u
+
+          ./openstack/diskimage-builder/tests/run_functests.sh
+
+          set +u
+          deactivate
+          set -u
+
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
index d8c7773a..bb5c122f 100644
--- a/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
@@ -42,7 +42,7 @@
           # use the larger mounted space.
           cd ~
           sudo mkdir /opt/dib_cache
-          sudo chown jenkins:jenkins /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
           export DIB_NO_TMPFS=1
           export TMPDIR=/opt/dib_cache
 
@@ -68,7 +68,11 @@
           set +u
           source ./env/bin/activate
           set -u
-          ./openstack/diskimage-builder/tests/run_functests.sh gentoo/build-succeeds debian-minimal/stable-vm opensuse-minimal/opensuse423-build-succeeds
+
+          ./openstack/diskimage-builder/tests/run_functests.sh \
+            gentoo/build-succeeds \
+            debian-minimal/stable-vm \
+            opensuse-minimal/opensuse423-build-succeeds
 
           set +u
           deactivate
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
index e0cf70c1..462b856a 100644
--- a/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
@@ -42,7 +42,7 @@
           # use the larger mounted space.
           cd ~
           sudo mkdir /opt/dib_cache
-          sudo chown jenkins:jenkins /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
           export DIB_NO_TMPFS=1
           export TMPDIR=/opt/dib_cache
 
@@ -68,7 +68,14 @@
           set +u
           source ./env/bin/activate
           set -u
-          ./openstack/diskimage-builder/tests/run_functests.sh centos7/build-succeeds opensuse/build-succeeds opensuse/opensuse423-build-succeeds fedora/build-succeeds ubuntu/trusty-build-succeeds ubuntu/xenial-build-succeeds
+
+          ./openstack/diskimage-builder/tests/run_functests.sh \
+            centos7/build-succeeds \
+            opensuse/build-succeeds \
+            opensuse/opensuse423-build-succeeds \
+            fedora/build-succeeds \
+            ubuntu/trusty-build-succeeds \
+            ubuntu/xenial-build-succeeds
 
           set +u
           deactivate
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml
index 1a25dfcb..1d9de73c 100644
--- a/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python3-opensuse-423/run.yaml
@@ -34,20 +34,48 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
-        cmd: "set -u\nset -e\nset -x\n#\n# We do things that might exceed the default\
-          \ 2GiB tmpfs, and\n# use the larger mounted space.\ncd ~\nsudo mkdir /opt/dib_cache\n\
-          sudo chown jenkins:jenkins /opt/dib_cache\nexport DIB_NO_TMPFS=1\nexport\
-          \ TMPDIR=/opt/dib_cache\n\nvirtualenv -p python3 env\n\nexport UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt\n\
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE\n./env/bin/pip install\
-          \ $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE\n\n# TODO(pabelanger):\
-          \ Remove once we migrated to bindep\n./openstack/diskimage-builder/tests/install_test_deps.sh\n\
-          \n# This sets up some repo files pointing to the infra mirrors\n# which\
-          \ are used during test runs\n./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh\n\
-          \n# UPPER_CONSTRAINTS_FILE is causing side effects when doing image\n# build,\
-          \ unset it\nunset UPPER_CONSTRAINTS_FILE\n\n# activate the virtualenv so\
-          \ that any tools run by dib run\n# using the python inside it\nset +u\n\
-          source ./env/bin/activate\nset -u\n./openstack/diskimage-builder/tests/run_functests.sh\
-          \ \nset +u\ndeactivate\nset -u\n"
+        cmd: |
+          set -u
+          set -e
+          set -x
+          #
+          # We do things that might exceed the default 2GiB tmpfs, and
+          # use the larger mounted space.
+          cd ~
+          sudo mkdir /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
+          export DIB_NO_TMPFS=1
+          export TMPDIR=/opt/dib_cache
+
+          virtualenv -p python2 env
+
+          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
+          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
+          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
+
+          # TODO(pabelanger): Remove once we migrated to bindep
+          ./openstack/diskimage-builder/tests/install_test_deps.sh
+
+          # This sets up some repo files pointing to the infra mirrors
+          # which are used during test runs
+          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
+
+          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
+          # build, unset it
+          unset UPPER_CONSTRAINTS_FILE
+
+          # activate the virtualenv so that any tools run by dib run
+          # using the python inside it
+          set +u
+          source ./env/bin/activate
+          set -u
+
+          ./openstack/diskimage-builder/tests/run_functests.sh
+
+          set +u
+          deactivate
+          set -u
+
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python3/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
index ef67ee89..dff4d338 100644
--- a/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
+++ b/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
@@ -33,20 +33,48 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
-        cmd: "set -u\nset -e\nset -x\n#\n# We do things that might exceed the default\
-          \ 2GiB tmpfs, and\n# use the larger mounted space.\ncd ~\nsudo mkdir /opt/dib_cache\n\
-          sudo chown jenkins:jenkins /opt/dib_cache\nexport DIB_NO_TMPFS=1\nexport\
-          \ TMPDIR=/opt/dib_cache\n\nvirtualenv -p python3 env\n\nexport UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt\n\
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE\n./env/bin/pip install\
-          \ $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE\n\n# TODO(pabelanger):\
-          \ Remove once we migrated to bindep\n./openstack/diskimage-builder/tests/install_test_deps.sh\n\
-          \n# This sets up some repo files pointing to the infra mirrors\n# which\
-          \ are used during test runs\n./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh\n\
-          \n# UPPER_CONSTRAINTS_FILE is causing side effects when doing image\n# build,\
-          \ unset it\nunset UPPER_CONSTRAINTS_FILE\n\n# activate the virtualenv so\
-          \ that any tools run by dib run\n# using the python inside it\nset +u\n\
-          source ./env/bin/activate\nset -u\n./openstack/diskimage-builder/tests/run_functests.sh\
-          \ \nset +u\ndeactivate\nset -u\n"
+        cmd: |
+          set -u
+          set -e
+          set -x
+          #
+          # We do things that might exceed the default 2GiB tmpfs, and
+          # use the larger mounted space.
+          cd ~
+          sudo mkdir /opt/dib_cache
+          sudo chown zuul:zuul /opt/dib_cache
+          export DIB_NO_TMPFS=1
+          export TMPDIR=/opt/dib_cache
+
+          virtualenv -p python2 env
+
+          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
+          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
+          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
+
+          # TODO(pabelanger): Remove once we migrated to bindep
+          ./openstack/diskimage-builder/tests/install_test_deps.sh
+
+          # This sets up some repo files pointing to the infra mirrors
+          # which are used during test runs
+          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
+
+          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
+          # build, unset it
+          unset UPPER_CONSTRAINTS_FILE
+
+          # activate the virtualenv so that any tools run by dib run
+          # using the python inside it
+          set +u
+          source ./env/bin/activate
+          set -u
+
+          ./openstack/diskimage-builder/tests/run_functests.sh
+
+          set +u
+          deactivate
+          set -u
+
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'