zuul
/
zuul-preview
Code Issues Proposed changes

Use artifact name rather than log_url 

So that we can return the preview URL as the success url, use the
artifact name to look up the forward URL.

Change-Id: I8d67e1527d8f911579779a9a036a3c7f5c79a27f
This commit is contained in:
James E. Blair 2019-03-01 12:34:42 -08:00
parent f6c78a3605
commit f5121119c8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zuul-preview/main.cc
View File

@ -122,7 +122,7 @@ int main(int, char**)
// (protected by an internal mutex) and expect exactly one line of
// output for each.
// Expected input:
// https://zuul.opendev.org site.926bb0aaddad4bc3853269451e115dcb.openstack.preview.opendev.org
// https://zuul.opendev.org site.167715b656ee4504baa940c5bd9f3821.openstack.preview.opendev.org
while (getline(cin, input)) {
// Split the input into api_url, hostname
@ -163,12 +163,18 @@ int main(int, char**)
web::http::methods::GET, uri.to_string()).get();
// body is a web::json::value
auto body = response.extract_json().get();
auto artifacts = body["artifacts"].as_array();
// TODO: use artifact instead of log_url
// body["log_url"].as_string() returns a const std::string&
cout << body["log_url"].as_string() << endl;
string artifact_url = "Artifact_not_found";
for (uint i = 0; i < artifacts.size(); i++) {
if (artifacts[i]["name"].as_string() == artifact) {
artifact_url = artifacts[i]["url"].as_string();
}
}
cache.put(hostname, body["log_url"].as_string());
cout << artifact_url << endl;
cache.put(hostname, artifact_url);
} catch (...) {
// If anything goes wrong, we still need to return only a single
// string to apache, and recover for the next request, so we