align the python script for releasing with 8.14 (#12437)

Also update the failed build checking.

diff --git a/scripts/GenerateBuildTestAndStagingReport.py b/scripts/GenerateBuildTestAndStagingReport.py
index fb8874543e98b073b7893ea3cba709a39550248f..791c346f46b755580f3daa5acbe132c774c021c6 100644 (file)
--- a/scripts/GenerateBuildTestAndStagingReport.py
+++ b/scripts/GenerateBuildTestAndStagingReport.py
@@ -47,7 +47,9 @@ def getTestStatusHtml():
         return createTableRow(traffic_light.format(color="black"), "Test status: unable to retrieve status of tests")
     else:
         test_failures_json = test_failures_request.json()
-        if test_failures_json["count"] == 0:
+        # nowadays the responds doesn't contain count keyword when the build is successful
+        # while count word can be found when build fails
+        if "count" not in test_failures_json:
             return createTableRow(traffic_light.format(color="green"), "Test status: all tests passing")
         else:
             return createTableRow(traffic_light.format(color="red"), "Test status: there are " + str(test_failures_json["count"]) + " failing tests, <a href={}>check the build report</a>".format(buildResultUrl))

diff --git a/scripts/GeneratePostPublishReport.py b/scripts/GeneratePostPublishReport.py
index 4b11daf7542c938dd5b9be2a31a61d5ee889f278..12ed7cf88383223d8073a073927f5599be60947e 100644 (file)
--- a/scripts/GeneratePostPublishReport.py
+++ b/scripts/GeneratePostPublishReport.py
@@ -33,7 +33,7 @@ def checkArchetypeMetaData(archetypeMetadataUrl, version):
        if archetype_metadata_request.status_code != 200:
                return createTableRow(traffic_light.format(color="black"), "Check archetype metadata: <a href='{url}'>unable to retrieve metadata from {url}</a>".format(url=archetypeMetadataUrl))
        else:
-               if "version=\"{version}\"".format(version=version) in archetype_metadata_request.content:
+               if "version=\"{version}\"".format(version=version) in archetype_metadata_request.text:
                        return createTableRow(traffic_light.format(color="green"), "Check archetype metadata: <a href='{url}'>metadata is correct for {url}</a>".format(url=archetypeMetadataUrl))
                else:
                        return createTableRow(traffic_light.format(color="red"), "Check archetype metadata: <a href='{url}'>metadata seems to be incorrect for {url}</a>".format(url=archetypeMetadataUrl))
@@ -66,5 +66,5 @@ content += createTableRow("", "<a href=\"https://github.com/vaadin/framework/rel
 
 content += "</table></body></html>"
 
-with open("result/report.html", "wb") as f:
+with open("result/report.html", "w") as f:
        f.write(content)