Skip to content

USHIFT-3139: Release notes job: create tag before referencing it #3330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
May 8, 2024
Merged

USHIFT-3139: Release notes job: create tag before referencing it #3330

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c0d88b
Create tag before using it to find previous one
pmtk May 7, 2024
7b01391
Improve log messages
pmtk May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions scripts/release-notes/gen_ec_release_notes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ def check_for_new_releases(url_base, release_type, version):
if github_release_exists(release_name):
print("Found an existing release, no work to do")
return None
print("Not found")
print(f"Release tag {release_name} not found on remote repository")

return Release(
release_name,
Expand Down Expand Up @@ -454,6 +454,13 @@ def tag_release(tag, sha, buildtime):
env=env,
check=True,
)


def push_tag(tag):
env = {}
# Include our existing environment settings to ensure values like
# HOME and other git settings are propagated.
env.update(os.environ)
print(f'git push {REMOTE} {tag}')
cmd = ['git', 'push', REMOTE, tag]
completed = subprocess.run(
Expand Down Expand Up @@ -510,6 +517,11 @@ def publish_release(new_release, take_action):

""")

if not tag_exists(release_name):
# release_date looks like 202402022103
buildtime = datetime.datetime.strptime(release_date, '%Y%m%d%H%M')
tag_release(release_name, commit_sha, buildtime)

# Get the previous tag on the branch as the starting point for the
# release notes.
previous_tag = get_previous_tag(release_name)
Expand Down Expand Up @@ -537,10 +549,7 @@ def publish_release(new_release, take_action):
print(notes)
return

if not tag_exists(release_name):
# release_date looks like 202402022103
buildtime = datetime.datetime.strptime(release_date, '%Y%m%d%H%M')
tag_release(release_name, commit_sha, buildtime)
push_tag(release_name)

# Create draft release with message that includes download URLs and history
try:
Expand All @@ -563,11 +572,7 @@ def github_release_create(tag, notes):
draft=False,
prerelease=True,
)
print(f'Created new release {tag}')
print()
print(results['html_url'])
print()
print(results['body'])
print(f'Created new release {tag}:{ {"url":results["html_url"], "body": results["body"]} }')


def github_release_notes(previous_tag, tag_name, target_commitish):
Expand Down Expand Up @@ -597,7 +602,7 @@ def github_api(path, **data):
)
else:
r = request.Request(url=url)
print(r.get_method(), url, data)
print(f"GitHub API Request: { {'method':r.get_method(), 'url': url, 'data': data} }")
r.add_header('Accept', 'application/vnd.github+json')
r.add_header('User-agent', 'microshift-release-notes')
r.add_header('Authorization', f'Bearer {GITHUB_TOKEN}')
Expand Down