From c76f217ff0fc09b8bd4ab4645b416ed3e55d93f8 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Tue, 20 Dec 2016 10:40:31 +0200 Subject: Update build report for GitHub and removed widgets module (#8037) --- scripts/GenerateBuildTestAndStagingReport.py | 14 +++++--------- scripts/GeneratePostPublishReport.py | 14 +++++++++----- scripts/GeneratePublishReportPart1.py | 8 ++------ 3 files changed, 16 insertions(+), 20 deletions(-) (limited to 'scripts') diff --git a/scripts/GenerateBuildTestAndStagingReport.py b/scripts/GenerateBuildTestAndStagingReport.py index 16abd340ae..c5c31b09cd 100644 --- a/scripts/GenerateBuildTestAndStagingReport.py +++ b/scripts/GenerateBuildTestAndStagingReport.py @@ -125,7 +125,7 @@ def completeArtifactNames(artifactIds, version): allowedPluginArtifacts = completeArtifactNames([ 'vaadin-maven-plugin' ], args.version) allowedArchetypeArtifacts = completeArtifactNames([ 'vaadin-archetype-application', 'vaadin-archetype-application-multimodule', 'vaadin-archetype-application-example', 'vaadin-archetype-widget', 'vaadin-archetype-liferay-portlet' ], args.version) -allowedFrameworkArtifacts = completeArtifactNames([ 'vaadin-root', 'vaadin-bom', 'vaadin-shared', 'vaadin-server', 'vaadin-client', 'vaadin-client-compiler', 'vaadin-client-compiled', 'vaadin-push', 'vaadin-themes', 'vaadin-widgets', 'vaadin-compatibility-shared', 'vaadin-compatibility-server', 'vaadin-compatibility-client', 'vaadin-compatibility-client-compiled', 'vaadin-compatibility-themes' ], args.version) +allowedFrameworkArtifacts = completeArtifactNames([ 'vaadin-root', 'vaadin-bom', 'vaadin-shared', 'vaadin-server', 'vaadin-client', 'vaadin-client-compiler', 'vaadin-client-compiled', 'vaadin-push', 'vaadin-themes', 'vaadin-compatibility-shared', 'vaadin-compatibility-server', 'vaadin-compatibility-client', 'vaadin-compatibility-client-compiled', 'vaadin-compatibility-themes' ], args.version) content = "" traffic_light = "" @@ -163,16 +163,12 @@ content += createTableRow("", "Check that trac tickets have correct status") -# pending release tickets without milestone -content += createTableRow("", "Pending-release tickets without milestone") +# check that GitHub issues are in the correct status +content += createTableRow("", "Check that closed GitHub issues have correct milestone") content += createTableRow("", "

Preparations before publishing

") -# close trac milestone -content += createTableRow("", "Close Trac Milestone (deselect \"retarget tickets\")".format(version=args.version)) -# verify pending release tickets still have milestone -content += createTableRow("", "Verify pending release tickets still have milestone {version}".format(version=args.version)) +# close GitHub milestone +content += createTableRow("", "Close GitHub Milestone" # link to build dependencies tab to initiate publish step content += createTableRow("", "

Start Publish Release from dependencies tab

".format(args.teamcityUrl, args.buildId, args.buildTypeId)) diff --git a/scripts/GeneratePostPublishReport.py b/scripts/GeneratePostPublishReport.py index a8fbbb705f..c496debb61 100644 --- a/scripts/GeneratePostPublishReport.py +++ b/scripts/GeneratePostPublishReport.py @@ -13,6 +13,10 @@ buildResultUrl = "http://{}/viewLog.html?buildId={}&tab=buildResultsDiv&buildTyp (major, minor, maintenance) = args.version.split(".", 2) prerelease = "." in maintenance +def checkUrlStatus(url): + r = requests.get(url) + return r.status_code == 200 + def createTableRow(*columns): html = "" for column in columns: @@ -21,13 +25,13 @@ def createTableRow(*columns): traffic_light = "" -content = "
" +def getTrafficLight(b): + return traffic_light.format(color="green") if b else traffic_light.format(color="red") -# Batch update tickets in trac -content += createTableRow("", "Batch update tickets in Trac") +content = "
" -# Create milestone for next release -content += createTableRow("", "Create milestone for next release") +tagOk = checkUrlStatus("https://github.com/vaadin/framework/releases/tag/{ver}".format(ver=args.version)) +content += createTableRow(getTrafficLight(tagOk), "Tag ok on github.com") # Tag and pin build content += createTableRow("", "Tag and pin build".format(url=buildResultUrl)) diff --git a/scripts/GeneratePublishReportPart1.py b/scripts/GeneratePublishReportPart1.py index 7cb0e7989d..d3eda80284 100644 --- a/scripts/GeneratePublishReportPart1.py +++ b/scripts/GeneratePublishReportPart1.py @@ -65,9 +65,8 @@ content = """
- -""".format(metadataOk=getTrafficLight(metadataOk), tagOk=getTrafficLight(tagOk), downloadPageOk=getTrafficLight(downloadPageOk)) +""".format(metadataOk=getTrafficLight(metadataOk), downloadPageOk=getTrafficLight(downloadPageOk)) mavenUrl = "" if not prerelease: @@ -77,10 +76,7 @@ else: mavenUrl = "http://maven.vaadin.com/vaadin-prereleases/com/vaadin/vaadin-server/{ver}".format(ver=args.version) content += "".format(ver=args.version, mvnUrl=mavenUrl) -content += "".format(version=args.version) - -if not prerelease: - content += '' +content += "" content += """ -- cgit v1.2.3
{metadataOk}Metadata ok on vaadin.com
{tagOk}Tag ok on github.com
{downloadPageOk}Download folder on vaadin.com contains the version
Check {ver} is published as prerelease to maven.vaadin.com
Add version {version} to Trac
Set latest version to default
Create milestone for next version in GitHub
Verify uploaded to test.vaadin.com