Add extra output for lftools nexus release

Add "Missing" value to the failure condition, as well as log it.
Refactored the code for finding errors as well.

ISSUE: RELENG-2453

Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org>
Change-Id: Id4efd6eaf870c9ce60d670094b6916b3c7b407cd

diff --git a/lftools/nexus/cmd.py b/lftools/nexus/cmd.py
index 6c72b47..66344da 100644 (file)
--- a/lftools/nexus/cmd.py
+++ b/lftools/nexus/cmd.py
@@ -304,6 +304,46 @@ def delete_images(settings_file, url, images):
         _nexus.delete_image(image)
 
 
+def get_activity_text(act):
+    """Concatenate the Value strings in the XML data and return it.
+
+    <stagingActivityEvent>
+        <timestamp>2019-10-18T09:39:24.841Z</timestamp>
+        <name>ruleFailed</name>
+        <severity>1</severity>
+        <properties>
+            <stagingProperty>
+                <name>typeId</name>
+                <value>javadoc-staging</value>
+            </stagingProperty>
+            <stagingProperty>
+                <name>failureMessage</name>
+                <value>
+                    Missing: no javadoc jar found in folder '/org/opendaylight/odlparent/leveldbjni-all/6.0.1'
+                </value>
+            </stagingProperty>
+        </properties>
+    </stagingActivityEvent>
+    """
+    tmp_list = []
+    act_soup = bs4.BeautifulSoup(str(act), 'xml')
+    stagingProperties = act_soup.find_all("stagingProperty")
+    for stagingProperty in stagingProperties:
+        value = stagingProperty.find("value")
+        tmp_list.append(value.text)
+    txt_str = ' --> '.join(map(str, tmp_list))
+    return txt_str
+
+
+def add_str_if_not_exist(new_str, existing_str_lst):
+    """Will return True if the new string provided is not already in the list of strings."""
+    addthis = True
+    for fail2txt in existing_str_lst:
+        if new_str.text in fail2txt:
+            addthis = False
+    return addthis
+
+
 def release_staging_repos(repos, verify, nexus_url=""):
     """Release one or more staging repos.
 
@@ -328,51 +368,60 @@ def release_staging_repos(repos, verify, nexus_url=""):
 
         soup = bs4.BeautifulSoup(response.text, 'xml')
         values = soup.find_all("value")
-        names = soup.find_all("name")
+        activities = soup.find_all("stagingActivityEvent")
         failures = []
+        failures2 = []
         successes = []
         isrepoclosed = []
 
-        # Check for failures
+        for act in activities:
+            # Check for failures
+            if re.search('ruleFailed', act.text):
+                failures2.append(get_activity_text(act))
+            if re.search('repositoryCloseFailed', act.text):
+                failures2.append(get_activity_text(act))
+            # Check if already released
+            if re.search('repositoryReleased', act.text):
+                successes.append(get_activity_text(act))
+            # Check if already Closed
+            if re.search('repositoryClosed', act.text):
+                isrepoclosed.append(get_activity_text(act))
+
+        # Check for other failures (old code part). only add them if not already there
+        # Should be possible to remove this part, but could not find a sample XML with these values.
         for message in values:
             if re.search('StagingRulesFailedException', message.text):
-                failures.append(message)
+                if add_str_if_not_exist(message, failures2):
+                    failures.append(message.text)
             if re.search('Invalid', message.text):
-                failures.append(message)
-
-        # Check if already released
-        for name in names:
-            if re.search('repositoryReleased', name.text):
-                successes.append(name)
-
-        # Ensure Repository is in Closed state
-        for name in names:
-            if re.search('repositoryClosed', name.text):
-                isrepoclosed.append(name)
+                if add_str_if_not_exist(message, failures2):
+                    failures.append(message.text)
 
-        if len(failures) != 0:
-            log.info(failures)
+        # Start check result
+        if len(failures) != 0 or len(failures2) != 0:
+            log.info('\n'.join(map(str, failures2)))
+            log.info('\n'.join(map(str, failures)))
             log.info("One or more rules failed")
             sys.exit(1)
         else:
             log.info("PASS: No rules have failed")
 
         if len(successes) != 0:
-            log.info(successes)
+            log.info('\n'.join(map(str, successes)))
             log.info("Nothing to do: Repository already released")
             sys.exit(0)
 
-        if len(isrepoclosed) != 1:
+        if len(isrepoclosed) == 0:
             log.info(isrepoclosed)
             log.info("Repository is not in closed state")
             sys.exit(1)
         else:
-            log.info("PASS: Repository is in closed state")
+            log.info("PASS: Repository {} is in closed state".format(isrepoclosed[0]))
 
         log.info("Successfully verfied {}".format(str(repo)))
 
     if not verify:
-        print("running release")
+        log.info("running release")
         for repo in repos:
             data = {"data": {"stagedRepositoryIds": [repo]}}
             log.debug("Sending data: {}".format(data))