Merge "Upgrade pip and setuptools in the mirror venv"
diff --git a/jeepyb/cmd/create_cgitrepos.py b/jeepyb/cmd/create_cgitrepos.py
index d8da88b..8bd12e6 100644
--- a/jeepyb/cmd/create_cgitrepos.py
+++ b/jeepyb/cmd/create_cgitrepos.py
@@ -16,6 +16,9 @@
# create_cgitrepos.py reads the project config file called projects.yaml
# and generates a cgitrepos configuration file which is then copied to
# the cgit server.
+#
+# It also creates the necessary top-level directories for each project
+# organization (openstack, stackforge, etc)
import os
import yaml
@@ -39,6 +42,9 @@
assert name not in names
names.add(name)
gitorgs.setdefault(org, []).append((name, description))
+ for org in gitorgs:
+ if not os.path.isdir('%s/%s' % (REPO_PATH, org)):
+ os.makedirs('%s/%s' % (REPO_PATH, org))
with open(CGIT_REPOS, 'w') as cgit_file:
cgit_file.write('# Autogenerated by create_cgitrepos.py\n')
for org in sorted(gitorgs):
diff --git a/jeepyb/cmd/expire_old_reviews.py b/jeepyb/cmd/expire_old_reviews.py
index 9aaad0f..77f9856 100644
--- a/jeepyb/cmd/expire_old_reviews.py
+++ b/jeepyb/cmd/expire_old_reviews.py
@@ -75,7 +75,7 @@
if 'rowCount' not in row:
# Search for negative approvals
for approval in row['currentPatchSet']['approvals']:
- if approval['value'] == '-1':
+ if approval['value'] in ('-1', '-2'):
expire_patch_set(ssh,
row['currentPatchSet']['revision'],
row['subject'])
diff --git a/jeepyb/cmd/update_bug.py b/jeepyb/cmd/update_bug.py
index 1041da2..bc433ae 100644
--- a/jeepyb/cmd/update_bug.py
+++ b/jeepyb/cmd/update_bug.py
@@ -142,6 +142,7 @@
'openstack/quantum': 'neutron',
'openstack/python-quantumclient': 'python-neutronclient',
'openstack/oslo-incubator': 'oslo',
+ 'openstack/tripleo-incubator': 'tripleo',
'openstack-infra/askbot-theme': 'openstack-ci',
'openstack-infra/config': 'openstack-ci',
'openstack-infra/devstack-gate': 'openstack-ci',
@@ -196,7 +197,7 @@
return full_project_name in [
'openstack/openstack-manuals',
'openstack/api-site',
- 'openstack/tempest',
+ 'openstack/tripleo-incubator',
'openstack-dev/devstack',
'openstack-infra/askbot-theme',
'openstack-infra/config',