[ACIX-453] Agent 6 release tasks support

tasks/libs/ciproviders/github_api.py

@@ -12,7 +12,7 @@
 import requests
 
 from tasks.libs.common.color import color_message
-from tasks.libs.common.constants import GITHUB_REPO_NAME
+from tasks.libs.common.constants import DEFAULT_AGENT6_BRANCH, GITHUB_REPO_NAME
 
 try:
     import semver
@@ -202,6 +202,9 @@ def latest_release(self) -> str:
         release = self._repository.get_latest_release()
         return release.title
 
+    def get_releases(self):
+        return self._repository.get_releases()
+
     def latest_unreleased_release_branches(self):
         """
         Get all the release branches that are newer than the latest release.
@@ -444,7 +447,7 @@ def create_release_pr(title, base_branch, target_branch, version, changelog_pr=F
     ]
 
     if changelog_pr:
-        labels.append("backport/main")
+        labels.append(f"backport/{DEFAULT_AGENT6_BRANCH}" if base_branch.startswith('6.') else "backport/main")
 
     updated_pr = github.update_pr(
         pull_number=pr.number,

tasks/libs/common/constants.py

@@ -1,3 +1,5 @@
+DEFAULT_AGENT6_VERSION = "6.53.0"
+DEFAULT_AGENT6_BRANCH = "6.53.x"
 DEFAULT_BRANCH = "main"
 DEFAULT_INTEGRATIONS_CORE_BRANCH = "master"
 GITHUB_ORG = "DataDog"

tasks/libs/common/git.py

@@ -8,7 +8,7 @@
 from invoke.exceptions import Exit
 
 from tasks.libs.common.color import Color, color_message
-from tasks.libs.common.constants import DEFAULT_BRANCH
+from tasks.libs.common.constants import DEFAULT_AGENT6_BRANCH, DEFAULT_BRANCH
 from tasks.libs.common.user_interactions import yes_no_question
 
 if TYPE_CHECKING:
@@ -134,12 +134,12 @@ def get_main_parent_commit(ctx) -> str:
     return ctx.run("git merge-base HEAD origin/main", hide=True).stdout.strip()
 
 
-def check_base_branch(branch, release_version):
+def check_base_branch(branch, release_version, agent6=False):
     """
     Checks if the given branch is either the default branch or the release branch associated
     with the given release version.
     """
-    return branch == DEFAULT_BRANCH or branch == release_version.branch()
+    return branch == (DEFAULT_AGENT6_BRANCH if agent6 else DEFAULT_BRANCH) or branch == release_version.branch()
 
 
 def try_git_command(ctx, git_command):

tasks/libs/releasing/notes.py

@@ -2,21 +2,22 @@
 
 from invoke import Failure
 
-from tasks.libs.common.constants import DEFAULT_BRANCH, GITHUB_REPO_NAME
+from tasks.libs.common.constants import DEFAULT_AGENT6_BRANCH, DEFAULT_BRANCH, GITHUB_REPO_NAME
 from tasks.libs.releasing.version import current_version
 
 
 def _add_prelude(ctx, version):
     res = ctx.run(f"reno new prelude-release-{version}")
     new_releasenote = res.stdout.split(' ')[-1].strip()  # get the new releasenote file path
+    branch = DEFAULT_AGENT6_BRANCH if version.startswith('6.') else 'master'
 
     with open(new_releasenote, "w") as f:
         f.write(
             f"""prelude:
     |
     Release on: {date.today()}
 
-    - Please refer to the `{version} tag on integrations-core <https://github.com/DataDog/integrations-core/blob/master/AGENT_CHANGELOG.md#datadog-agent-version-{version.replace('.', '')}>`_ for the list of changes on the Core Checks
+    - Please refer to the `{version} tag on integrations-core <https://github.com/DataDog/integrations-core/blob/{branch}/AGENT_CHANGELOG.md#datadog-agent-version-{version.replace('.', '')}>`_ for the list of changes on the Core Checks
 """
         )
 
@@ -25,29 +26,25 @@ def _add_prelude(ctx, version):
     print(f"git commit -m \"Add prelude for {version} release\"")
 
 
-def _add_dca_prelude(ctx, agent7_version, agent6_version=""):
-    """
-    Release of the Cluster Agent should be pinned to a version of the Agent.
-    """
-    res = ctx.run(f"reno --rel-notes-dir releasenotes-dca new prelude-release-{agent7_version}")
-    new_releasenote = res.stdout.split(' ')[-1].strip()  # get the new releasenote file path
+def _add_dca_prelude(ctx, version=None):
+    """Release of the Cluster Agent should be pinned to a version of the Agent."""
 
-    if agent6_version != "":
-        agent6_version = (
-            f"--{agent6_version.replace('.', '')}"  # generate the right hyperlink to the agent's changelog.
-        )
+    branch = DEFAULT_AGENT6_BRANCH if version.startswith('6.') else DEFAULT_BRANCH
+
+    res = ctx.run(f"reno --rel-notes-dir releasenotes-dca new prelude-release-{version}")
+    new_releasenote = res.stdout.split(' ')[-1].strip()  # get the new releasenote file path
 
     with open(new_releasenote, "w") as f:
         f.write(
             f"""prelude:
     |
     Released on: {date.today()}
-    Pinned to datadog-agent v{agent7_version}: `CHANGELOG <https://github.com/{GITHUB_REPO_NAME}/blob/{DEFAULT_BRANCH}/CHANGELOG.rst#{agent7_version.replace('.', '')}{agent6_version}>`_."""
+    Pinned to datadog-agent v{version}: `CHANGELOG <https://github.com/{GITHUB_REPO_NAME}/blob/{branch}/CHANGELOG.rst#{version.replace('.', '')}>`_."""
         )
 
     ctx.run(f"git add {new_releasenote}")
     print("\nIf not run as part of finish task, commit this with:")
-    print(f"git commit -m \"Add prelude for {agent7_version} release\"")
+    print(f"git commit -m \"Add prelude for {version} release\"")
 
 
 def update_changelog_generic(ctx, new_version, changelog_dir, changelog_file):

tasks/libs/releasing/version.py

@@ -61,11 +61,13 @@ def _create_version_from_match(match):
     return version
 
 
-def check_version(agent_version):
+def check_version(agent_version, agent6=False):
     """Check Agent version to see if it is valid."""
-    version_re = re.compile(r'7[.](\d+)[.](\d+)(-rc\.(\d+))?')
+
+    lead = '6' if agent6 else '7'
+    version_re = re.compile(rf'{lead}[.](\d+)[.](\d+)(-rc\.(\d+))?')
     if not version_re.match(agent_version):
-        raise Exit(message="Version should be of the form 7.Y.Z or 7.Y.Z-rc.t")
+        raise Exit(message=f"Version should be of the form {lead}.Y.Z or {lead}.Y.Z-rc.t")
 
 
 def current_version(ctx, major_version) -> Version:
@@ -115,10 +117,6 @@ def next_rc_version(ctx, major_version, patch_version=False) -> Version:
     return new_version
 
 
-def parse_major_versions(major_versions):
-    return sorted(int(x) for x in major_versions.split(","))
-
-
 ##
 ## Repository version fetch functions
 ## The following functions aim at returning the correct version to use for a given

tasks/modules.py

@@ -30,6 +30,7 @@ def __init__(
         independent=False,
         lint_targets=None,
         used_by_otel=False,
+        **_kwargs,  # Deprecated args
     ):
         self.path = path
         self.targets = targets if targets else ["."]

tasks/notes.py

@@ -16,11 +16,11 @@ def add_prelude(ctx, version):
 
 
 @task
-def add_dca_prelude(ctx, agent7_version, agent6_version=""):
+def add_dca_prelude(ctx, version):
     """
     Release of the Cluster Agent should be pinned to a version of the Agent.
     """
-    _add_dca_prelude(ctx, agent7_version, agent6_version)
+    _add_dca_prelude(ctx, version)
 
 
 @task