diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-19 17:53:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-19 17:53:39 +0000 |
| commit | d6d5f1712c3661c8f8822c6d02b9a0e71c1370f4 (patch) | |
| tree | 96a054c166ac86f9708f991549b3a9b1051a7282 | |
| parent | 6ffff7c95706e3a39e82fa0362e825aab21cbb26 (diff) | |
| parent | e387ef0cad8d065a0614e531d8ed4849997a6a34 (diff) | |
| download | pbr-d6d5f1712c3661c8f8822c6d02b9a0e71c1370f4.tar.gz | |
Merge "Make tools/integration.sh take a branch"
| -rw-r--r-- | tools/integration.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/integration.sh b/tools/integration.sh index 8053406..b6021f3 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -106,6 +106,8 @@ sudo chown root:root /etc/apache2/sites-available/pypi sudo a2ensite pypi sudo service apache2 reload +#BRANCH +BRANCH=${OVERRIDE_ZUUL_BRANCH=:-master} # PROJECTS is a list of projects that we're testing PROJECTS=$* @@ -117,7 +119,7 @@ cd $pbrsdistdir # --no-update is passed as well. The one thing the -b # does give us is it makes run-mirror install dependencies # once instead of over and over for all branches it can find. -$pypimirrorvenv/bin/run-mirror -b remotes/origin/master --no-update --verbose -c $tmpdir/mirror.yaml --no-process --export=$HOME/mirror_package_list.txt +$pypimirrorvenv/bin/run-mirror -b remotes/origin/$BRANCH --no-update --verbose -c $tmpdir/mirror.yaml --no-process --export=$HOME/mirror_package_list.txt # Compare packages in the mirror with the list of requirements gen_bare_package_list "$REPODIR/requirements/global-requirements.txt $REPODIR/requirements/dev-requirements.txt" > bare_all_requirements.txt gen_bare_package_list $HOME/mirror_package_list.txt > bare_mirror_package_list.txt @@ -130,7 +132,7 @@ $pypimirrorvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload $pypimirrorvenv/bin/pip install -i http://pypi.python.org/simple -d $tmpdownload/pip/openstack -r requirements.txt $pypimirrorvenv/bin/python setup.py sdist -d $tmpdownload/pip/openstack -$pypimirrorvenv/bin/run-mirror -b remotes/origin/master --no-update --verbose -c $tmpdir/mirror.yaml --no-download +$pypimirrorvenv/bin/run-mirror -b remotes/origin/$BRANCH --no-update --verbose -c $tmpdir/mirror.yaml --no-download find $pypidir -type f -name '*.html' -delete find $pypidir |