[BARX-661] remove --use-release-entries and release_version from everywhere (#36143)

(cherry picked from commit 59cb01a)

Author: sabrina-datadog

.gitlab-ci.yml

@@ -148,7 +148,6 @@ variables:
   BTFHUB_ARCHIVE_BRANCH: main
   GENERAL_ARTIFACTS_CACHE_BUCKET_URL: https://dd-agent-omnibus.s3.amazonaws.com
   S3_DSD6_URI: s3://dsd6-staging
-  RELEASE_VERSION: nightly
 
   # Build images versions
   # To use images from datadog-agent-buildimages dev branches, set the corresponding

.gitlab/binary_build/cluster_agent.yml

@@ -4,7 +4,7 @@
   needs: ["go_mod_tidy_check"]
   script:
     - inv check-go-version
-    - inv -e cluster-agent.build --release-version "$RELEASE_VERSION" --major-version "$AGENT_MAJOR_VERSION"
+    - inv -e cluster-agent.build
     - $S3_CP_CMD $CI_PROJECT_DIR/$CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent $S3_ARTIFACTS_URI/datadog-cluster-agent.$ARCH
     - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/datadog-cluster.yaml $S3_ARTIFACTS_URI/datadog-cluster.yaml
     - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/security-agent-policies $S3_ARTIFACTS_URI/security-agent-policies --recursive

.gitlab/notify/notify.yml

@@ -54,33 +54,3 @@ send_pipeline_stats:
     - export DD_API_KEY=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh $API_KEY_ORG2_SSM_NAME)
     - !reference [.setup_python_mirror_linux]
     - invoke -e notify.send-stats
-
-notify_github:
-  stage: notify
-  image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
-  tags: ["runner:docker"]
-  rules:
-    - !reference [.except_mergequeue]
-    - !reference [.except_main_or_release_branch]
-    - !reference [.except_no_tests_no_deploy]
-    - if: $RELEASE_VERSION != ""
-      changes:
-        paths:
-          - '**/*.go'
-        compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
-      when: on_success
-    - when: never
-  needs:
-    - job: "deploy_deb_testing-a6_x64"
-      optional: true
-  dependencies: []
-  allow_failure: true
-  script:
-    - !reference [.install_pr_commenter]
-    - messagefile="$(mktemp)"
-    - echo "Use this command from [test-infra-definitions](https://github.com/DataDog/test-infra-definitions) to manually test this PR changes on a VM:" >> "$messagefile"
-    - echo '```sh' >> "$messagefile"
-    - echo "inv create-vm --pipeline-id=$CI_PIPELINE_ID --os-family=ubuntu" >> "$messagefile"
-    - echo '```' >> "$messagefile"
-    - cat "$messagefile" | /usr/local/bin/pr-commenter --for-pr="$CI_COMMIT_REF_NAME" --header="Test changes on VM"
-    - rm "$messagefile"

.gitlab/package_build/windows.yml

@@ -22,7 +22,6 @@
       -e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
       -e OMNIBUS_TARGET=${OMNIBUS_TARGET}
       -e WINDOWS_BUILDER=true
-      -e RELEASE_VERSION="$RELEASE_VERSION"
       -e MAJOR_VERSION="$AGENT_MAJOR_VERSION"
       -e PY_RUNTIMES="$PYTHON_RUNTIMES"
       -e INTEGRATIONS_CORE_VERSION="$INTEGRATIONS_CORE_VERSION"
@@ -107,7 +106,6 @@ windows_zip_agent_binaries_x64-a6:
       -e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
       -e OMNIBUS_TARGET=${OMNIBUS_TARGET}
       -e WINDOWS_BUILDER=true
-      -e RELEASE_VERSION="$RELEASE_VERSION"
       -e MAJOR_VERSION="$AGENT_MAJOR_VERSION"
       -e INTEGRATIONS_CORE_VERSION="$INTEGRATIONS_CORE_VERSION"
       -e PY_RUNTIMES="$PYTHON_RUNTIMES"

Dockerfiles/agent/windows/README.md

@@ -6,7 +6,7 @@ How to build the Agent docker image
 From the root of the repository, run the following command:
 
 ```
-docker run --rm -it -v "${pwd}:c:\mnt" -e OMNIBUS_TARGET=main -e MAJOR_VERSION=7 -e RELEASE_VERSION=nightly -e PY_RUNTIMES=3 datadog/agent-buildimages-windows_x64:1809 c:\mnt\tasks\winbuildscripts\buildwin.bat
+docker run --rm -it -v "${pwd}:c:\mnt" -e OMNIBUS_TARGET=main -e MAJOR_VERSION=7 -e PY_RUNTIMES=3 datadog/agent-buildimages-windows_x64:1809 c:\mnt\tasks\winbuildscripts\buildwin.bat
 ```
 
 The above will build the Agent 7 nightly. To build the Agent 6, use the following variables:

docs/dev/agent_omnibus.md

@@ -87,10 +87,10 @@ To build on Windows, [Docker Desktop](https://docs.docker.com/docker-for-windows
 
 Start a Powershell prompt and navigate to your local clone of the `datadog-agent` repo.
 
- Run the following command: 
- 
+ Run the following command:
+
 ```powershell
-docker run -v "$(Get-Location):c:\mnt" -e OMNIBUS_TARGET=main -e RELEASE_VERSION=nightly -e MAJOR_VERSION=7 -e PY_RUNTIMES=3 -e TARGET_ARCH=x64 datadog/agent-buildimages-windows_x64:1809 c:\mnt\tasks\winbuildscripts\buildwin.bat
+docker run -v "$(Get-Location):c:\mnt" -e OMNIBUS_TARGET=main -e MAJOR_VERSION=7 -e PY_RUNTIMES=3 -e TARGET_ARCH=x64 datadog/agent-buildimages-windows_x64:1809 c:\mnt\tasks\winbuildscripts\buildwin.bat
 ```
 
 Downloading the Docker image may take some time in the first run.
@@ -100,7 +100,6 @@ Alternatively here's a small Powershell script to facilitate using the docker im
 param (
    [int]$MAJOR_VERSION=7,
    $TARGET_ARCH="x64",
-   $RELEASE_VERSION="nightly",
    [bool]$RM_CONTAINER=$true,
    [bool]$DEBUG=$false
 )
@@ -114,7 +113,7 @@ $cmd = "docker run"
 if ($RM_CONTAINER) {
     $cmd += " --rm "
 }
-$opts = "-e OMNIBUS_TARGET=main -e RELEASE_VERSION=$RELEASE_VERSION -e MAJOR_VERSION=$MAJOR_VERSION -e PY_RUNTIMES=$PY_RUNTIMES -e TARGET_ARCH=$TARGET_ARCH"
+$opts = "-e OMNIBUS_TARGET=main -e MAJOR_VERSION=$MAJOR_VERSION -e PY_RUNTIMES=$PY_RUNTIMES -e TARGET_ARCH=$TARGET_ARCH"
 if ($DEBUG) {
     $opts += " -e DEBUG_CUSTOMACTION=yes "
 }

release.json

@@ -1,29 +1,7 @@
 {
     "base_branch": "6.53.x",
     "current_milestone": "6.53.0",
-    "last_stable": {
-        "6": "6.52.0",
-        "7": "7.52.0"
-    },
-    "nightly": {
-        "INTEGRATIONS_CORE_VERSION": "7.53.x",
-        "OMNIBUS_RUBY_VERSION": "6.53.x",
-        "JMXFETCH_VERSION": "0.49.0",
-        "JMXFETCH_HASH": "b5c2c3ff27603f469bb11961d559f1154887963e02b9d70d5f1fc7efa527a486",
-        "MACOS_BUILD_VERSION": "nschweitzer/master",
-        "WINDOWS_DDNPM_DRIVER": "release-signed",
-        "WINDOWS_DDNPM_VERSION": "2.6.0",
-        "WINDOWS_DDNPM_SHASUM": "b1611ad4ceb8366c88767aeb638abefb226081efbf546b8b886952dd1b18ec05",
-        "SECURITY_AGENT_POLICIES_VERSION": "master",
-        "WINDOWS_DDPROCMON_DRIVER": "release-signed",
-        "WINDOWS_DDPROCMON_VERSION": "1.0.1",
-        "WINDOWS_DDPROCMON_SHASUM": "7c13ba75f7a30704a6a4082e4cffc819c846fd6061c53372c8b9908fee11d621",
-        "WINDOWS_APMINJECT_COMMENT": "The WINDOWS_APMINJECT entries below should NOT be added to the release targets",
-        "WINDOWS_APMINJECT_MODULE": "release-signed",
-        "WINDOWS_APMINJECT_VERSION": "1.1.1",
-        "WINDOWS_APMINJECT_SHASUM": "c5c228f6030ce2e19b8bfb28bd054dc246c7f1c799431e73018e6cb46ee59d2f"
-    },
-    "release": {
+    "dependencies": {
         "INTEGRATIONS_CORE_VERSION": "7.53.0",
         "OMNIBUS_RUBY_VERSION": "6.53.0",
         "JMXFETCH_VERSION": "0.49.0",
@@ -37,34 +15,8 @@
         "WINDOWS_DDPROCMON_VERSION": "1.0.1",
         "WINDOWS_DDPROCMON_SHASUM": "7c13ba75f7a30704a6a4082e4cffc819c846fd6061c53372c8b9908fee11d621"
     },
-    "dca-1.17.0": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.18.6"
-    },
-    "dca-1.16.0": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.17"
-    },
-    "dca-1.15.0": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.16"
-    },
-    "dca-1.14.0": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.15"
-    },
-    "dca-1.13.1": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.12"
-    },
-    "dca-1.13.0": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.10"
-    },
-    "dca-1.12.0": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.9"
-    },
-    "dca-1.10.0": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.5"
-    },
-    "dca-1.9.1": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.3"
-    },
-    "dca-1.9.0": {
-        "SECURITY_AGENT_POLICIES_VERSION": "v0.3"
+    "last_stable": {
+        "6": "6.52.0",
+        "7": "7.52.0"
     }
 }

tasks/cluster_agent.py

@@ -15,7 +15,7 @@
 from tasks.build_tags import get_build_tags, get_default_build_tags
 from tasks.cluster_agent_helpers import build_common, clean_common, refresh_assets_common, version_common
 from tasks.go import deps
-from tasks.libs.common.utils import load_release_versions
+from tasks.libs.common.utils import load_dependencies
 
 # constants
 BIN_PATH = os.path.join(".", "bin", "datadog-cluster-agent")
@@ -34,8 +34,6 @@ def build(
     development=True,
     skip_assets=False,
     policies_version=None,
-    release_version="nightly",
-    major_version='7',
 ):
     """
     Build Cluster Agent
@@ -58,11 +56,11 @@ def build(
     )
 
     if policies_version is None:
-        print(f"Loading release versions for {release_version}")
-        env = load_release_versions(ctx, release_version)
+        print("Loading dependencies from release.json")
+        env = load_dependencies(ctx)
         if "SECURITY_AGENT_POLICIES_VERSION" in env:
             policies_version = env["SECURITY_AGENT_POLICIES_VERSION"]
-            print(f"Security Agent polices for {release_version}: {policies_version}")
+            print(f"Security Agent polices: {policies_version}")
 
     build_context = "Dockerfiles/cluster-agent"
     policies_path = f"{build_context}/security-agent-policies"

tasks/github_tasks.py

@@ -7,7 +7,7 @@
 
 from invoke import Exit, task
 
-from tasks.libs.common.utils import DEFAULT_BRANCH, DEFAULT_INTEGRATIONS_CORE_BRANCH, get_git_pretty_ref
+from tasks.libs.common.utils import DEFAULT_BRANCH, DEFAULT_INTEGRATIONS_CORE_BRANCH, RELEASE_JSON_DEPENDENCIES, get_git_pretty_ref
 from tasks.libs.datadog_api import create_count, send_metrics
 from tasks.libs.github_actions_tools import (
     download_artifacts,
@@ -33,8 +33,8 @@ def concurrency_key():
     return current_ref
 
 
-def _trigger_macos_workflow(release, destination=None, retry_download=0, retry_interval=0, **kwargs):
-    github_action_ref = _get_release_json_value(f'{release}::MACOS_BUILD_VERSION')
+def _trigger_macos_workflow(destination=None, retry_download=0, retry_interval=0, **kwargs):
+    github_action_ref = _get_release_json_value(f'{RELEASE_JSON_DEPENDENCIES}::MACOS_BUILD_VERSION')
 
     run = trigger_macos_workflow(
         github_action_ref=github_action_ref,
@@ -60,7 +60,6 @@ def trigger_macos(
     _,
     workflow_type="build",
     datadog_agent_ref=DEFAULT_BRANCH,
-    release_version="nightly",
     major_version="7",
     python_runtimes="3",
     destination=".",
@@ -72,16 +71,11 @@ def trigger_macos(
 ):
     if workflow_type == "build":
         conclusion = _trigger_macos_workflow(
-            # Provide the release version to be able to fetch the associated
-            # macos-build branch from release.json for all workflows...
-            release_version,
             destination,
             retry_download,
             retry_interval,
             workflow_name="macos.yaml",
             datadog_agent_ref=datadog_agent_ref,
-            # ... And provide the release version as a workflow input when needed
-            release_version=release_version,
             major_version=major_version,
             python_runtimes=python_runtimes,
             # Send pipeline id and bucket branch so that the package version

tasks/libs/common/utils.py

@@ -34,6 +34,7 @@
     RTLOADER_LIB_NAME = "libdatadog-agent-rtloader.so"
 RTLOADER_HEADER_NAME = "datadog_agent_rtloader.h"
 AGENT_VERSION_CACHE_NAME = "agent-version.cache"
+RELEASE_JSON_DEPENDENCIES = "dependencies"
 
 
 def get_all_allowed_repo_branches():
@@ -556,14 +557,14 @@ def get_version_numeric_only(ctx, major_version='7'):
     return version
 
 
-def load_release_versions(_, target_version):
+def load_dependencies(_):
     with open("release.json", "r") as f:
         versions = json.load(f)
-        if target_version in versions:
-            # windows runners don't accepts anything else than strings in the
-            # environment when running a subprocess.
-            return {str(k): str(v) for k, v in versions[target_version].items()}
-    raise Exception(f"Could not find '{target_version}' version in release.json")
+        if RELEASE_JSON_DEPENDENCIES not in versions:
+            raise Exception(f"Could not find '{RELEASE_JSON_DEPENDENCIES}' in release.json")
+        # windows runners don't accepts anything else than strings in the
+        # environment when running a subprocess.
+        return {str(k): str(v) for k, v in versions[RELEASE_JSON_DEPENDENCIES].items()}
 
 
 ##

tasks/libs/github_actions_tools.py

@@ -18,7 +18,6 @@ def trigger_macos_workflow(
     workflow_name="macos.yaml",
     github_action_ref="master",
     datadog_agent_ref=DEFAULT_BRANCH,
-    release_version=None,
     major_version=None,
     python_runtimes="3",
     gitlab_pipeline_id=None,
@@ -36,9 +35,6 @@ def trigger_macos_workflow(
     if datadog_agent_ref is not None:
         inputs["datadog_agent_ref"] = datadog_agent_ref
 
-    if release_version is not None:
-        inputs["release_version"] = release_version
-
     if major_version is not None:
         inputs["agent_major_version"] = major_version
 

tasks/libs/pipeline_tools.py

@@ -82,7 +82,6 @@ def gracefully_cancel_pipeline(gitlab, pipeline, force_cancel_stages):
 def trigger_agent_pipeline(
     gitlab,
     ref=DEFAULT_BRANCH,
-    release_version="nightly",
     branch="nightly",
     deploy=False,
     all_builds=False,
@@ -116,8 +115,6 @@ def trigger_agent_pipeline(
     else:
         args["RUN_E2E_TESTS"] = "off"
 
-    args["RELEASE_VERSION"] = release_version
-
     if branch is not None:
         args["BUCKET_BRANCH"] = branch
 

tasks/msi.py

@@ -12,7 +12,7 @@
 from invoke import task
 from invoke.exceptions import Exit, UnexpectedExit
 
-from tasks.libs.common.utils import get_version, load_release_versions, timed
+from tasks.libs.common.utils import get_version, load_dependencies, timed
 
 # Windows only import
 try:
@@ -51,8 +51,8 @@ def _get_vs_build_command(cmd, vstudio_root=None):
     return cmd
 
 
-def _get_env(ctx, major_version='7', python_runtimes='3', release_version='nightly'):
-    env = load_release_versions(ctx, release_version)
+def _get_env(ctx, major_version='7', python_runtimes='3'):
+    env = load_dependencies(ctx)
 
     env['PACKAGE_VERSION'] = get_version(
         ctx, include_git=True, url_safe=True, major_version=major_version, include_pipeline_id=True
@@ -246,12 +246,12 @@ def _build_msi(ctx, env, outdir, name):
 
 @task
 def build(
-    ctx, vstudio_root=None, arch="x64", major_version='7', python_runtimes='3', release_version='nightly', debug=False
+    ctx, vstudio_root=None, arch="x64", major_version='7', python_runtimes='3', debug=False
 ):
     """
     Build the MSI installer for the agent
     """
-    env = _get_env(ctx, major_version, python_runtimes, release_version)
+    env = _get_env(ctx, major_version, python_runtimes)
     configuration = _msbuild_configuration(debug=debug)
     build_outdir = build_out_dir(arch, configuration)
 
@@ -303,12 +303,12 @@ def build(
 
 @task
 def test(
-    ctx, vstudio_root=None, arch="x64", major_version='7', python_runtimes='3', release_version='nightly', debug=False
+    ctx, vstudio_root=None, arch="x64", major_version='7', python_runtimes='3', debug=False
 ):
     """
     Run the unit test for the MSI installer for the agent
     """
-    env = _get_env(ctx, major_version, python_runtimes, release_version)
+    env = _get_env(ctx, major_version, python_runtimes)
     configuration = _msbuild_configuration(debug=debug)
     build_outdir = build_out_dir(arch, configuration)