Revert "Remove zuul-env from DIB images"

This reverts commit b770db0c21.

Turns out the zuul cloner shim in v3 does run out of the virtualenv's
python afterall. It appears to do this because it needs pyyaml
installed.

Change-Id: Idfa7a54e7c54b9068dc3d8ca9ff820c7aa47e8b4
This commit is contained in:
Clark Boylan 2017-11-21 19:20:05 -08:00
parent 6a8704e259
commit 132cdf30d5
1 changed files with 24 additions and 0 deletions

View File

@ -0,0 +1,24 @@
#!/bin/bash
# Copyright (C) 2015 OpenStack Foundation
# Copyright 2017 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
#
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
set -x
fi
set -eu
set -o pipefail
virtualenv /usr/zuul-env
/usr/zuul-env/bin/pip install git+https://git.openstack.org/openstack-infra/zuul.git