Merge "Switch from tox to nox"
diff --git a/jeepyb/cmd/manage_projects.py b/jeepyb/cmd/manage_projects.py
index 212d899..1a93709 100644
--- a/jeepyb/cmd/manage_projects.py
+++ b/jeepyb/cmd/manage_projects.py
@@ -179,7 +179,13 @@
if status != 0:
log.error("Failed to push config for project: %s" % project)
log.error(out)
- return False
+ if 'project state does not permit write' in out:
+ # We tried to push an acl update to a read only project.
+ # This is an error to Gerrit, but we treat it as success
+ # to allow other acls to update.
+ return True
+ else:
+ return False
return True
@@ -377,8 +383,10 @@
# nothing was copied, so we're done
return
create_groups_file(project, gerrit, repo_path)
- push_acl_config(project, remote_url, repo_path,
- GERRIT_GITID, ssh_env)
+ rc = push_acl_config(project, remote_url, repo_path,
+ GERRIT_GITID, ssh_env)
+ if not rc:
+ raise Exception("Non zero acl push return value.")
except Exception:
log.exception(
"Exception processing ACLS for %s." % project)
diff --git a/requirements.txt b/requirements.txt
index 679b9ec..396b115 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,7 @@
pbr>=1.6
gerritlib>=0.10.0
+launchpadlib>=1.10.13
PyMySQL
paramiko>=1.13.0
PyGithub