- job:
    name: pkgdeb-build-openstack-pkg-tools
    node: debian-jessie

    wrappers:
      - build-timeout:
          timeout: 30
      - timestamps

    builders:
    - gerrit-git-prep
    - shell: |
          #!/bin/bash

          set -x
          set -e

          sudo cp ${WORKSPACE}/build-tools/pkgos-infra-install-sbuild /usr/sbin
          sudo chmod +x /usr/sbin/pkgos-infra-install-sbuild
          sudo cp ${WORKSPACE}/build-tools/pkgos-infra-build-pkg /usr/bin
          sudo chmod +x /usr/bin/pkgos-infra-build-pkg
          sudo pkgos-infra-install-sbuild

    - shell: |
          #!/bin/bash

          set -x
          set -e

          pkgos-infra-build-pkg

    publishers:
      - console-log

- job:
    name: pkgdeb-build-openstack-pkg-tools
    node: debian-jessie

    wrappers:
      - build-timeout:
          timeout: 30
      - timestamps

    builders:
    - gerrit-git-prep
    - shell: |
          #!/bin/bash

          set -x
          set -e

          sudo cp ${WORKSPACE}/build-tools/pkgos-infra-install-sbuild /usr/sbin
          sudo chmod +x /usr/sbin/pkgos-infra-install-sbuild
          sudo cp ${WORKSPACE}/build-tools/pkgos-infra-build-pkg /usr/bin
          sudo chmod +x /usr/bin/pkgos-infra-build-pkg
          sudo pkgos-infra-install-sbuild
          pkgos-infra-build-pkg

    publishers:
      - console-log

Revert split into 2 shell scripts
Revert split into 2 shell scripts

Previously, it was attempted to split deb-openstack-pkg-tools.yaml into
2 shell scripts instead of one, to attempt to work around the sbuild
relogin problem. This didn't work, and since, a workaround was found.

Therefore, this patch cleans-up the mess from previous attemp, and
remerges into a single shell script.

Change-Id: Ibfd2dd812d78e2af6afd4a6739a8915214b8fa32
