test changes

Author: sabrina-datadog

.gitlab-ci.yml

@@ -161,7 +161,7 @@ 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
+  RELEASE_VERSION: release
 
   # Build images versions
   # To use images from datadog-agent-buildimages dev branches, set the corresponding

.gitlab/binary_build/cluster_agent.yml

@@ -1,15 +1,15 @@
 ---
 .cluster_agent-build_common:
   stage: binary_build
-  rules: 
+  rules:
     - !reference [.except_mergequeue]
     - when: on_success
   needs: ["go_mod_tidy_check", "go_deps"]
   before_script:
     - !reference [.retrieve_linux_go_deps]
   script:
     - dda inv -- check-go-version
-    - dda inv -- -e cluster-agent.build --release-version "$RELEASE_VERSION"
+    - dda inv -- -e cluster-agent.build
   artifacts:
     paths:
       - $CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent

release.json

@@ -5,20 +5,6 @@
         "6": "6.53.1",
         "7": "7.64.2"
     },
-    "nightly": {
-        "OMNIBUS_RUBY_VERSION": "95630818722a63cb9e6f3163984f363d799633a1",
-        "JMXFETCH_VERSION": "0.49.6",
-        "JMXFETCH_HASH": "f06bdac1f8ec41daf9b9839ac883f1865a068b04810ea82197b8a6afb9369cb9",
-        "MACOS_BUILD_VERSION": "master",
-        "WINDOWS_DDNPM_DRIVER": "release-signed",
-        "WINDOWS_DDNPM_VERSION": "2.7.1",
-        "WINDOWS_DDNPM_SHASUM": "0f4665761324e1fef1c21651be5b70e79c72b5e7e5662d74619e7db2b27d5bc2",
-        "SECURITY_AGENT_POLICIES_VERSION": "master",
-        "WINDOWS_DDPROCMON_DRIVER": "release-signed",
-        "WINDOWS_DDPROCMON_VERSION": "1.2.0",
-        "WINDOWS_DDPROCMON_SHASUM": "e5525959521254ba8218f64f644ad19cdeb720aa48ee83eb5e402a8d1643e32e",
-        "INTEGRATIONS_CORE_VERSION": "ed2c86a680621dfc5416a1751b6bc20cd8841c4b"
-    },
     "release": {
         "INTEGRATIONS_CORE_VERSION": "7.56.0-rc.2",
         "OMNIBUS_RUBY_VERSION": "7.56.0-rc.1",

tasks/cluster_agent.py

@@ -35,7 +35,6 @@ def build(
     development=True,
     skip_assets=False,
     policies_version=None,
-    release_version="nightly",
 ):
     """
     Build Cluster Agent
@@ -57,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(f"Loading release versions for release")
+        env = load_release_versions(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 for release: {policies_version}")
 
     build_context = "Dockerfiles/cluster-agent"
     policies_path = f"{build_context}/security-agent-policies"

tasks/github_tasks.py

@@ -72,7 +72,6 @@ def trigger_macos(
     _,
     workflow_type="build",
     datadog_agent_ref=None,
-    release_version="nightly",
     major_version="7",
     destination=".",
     version_cache=None,

tasks/libs/pipeline/tools.py

@@ -116,7 +116,6 @@ def gracefully_cancel_pipeline(repo: Project, pipeline: ProjectPipeline, force_c
 def trigger_agent_pipeline(
     repo: Project,
     ref=None,
-    release_version="nightly",
     branch="nightly",
     deploy=False,
     deploy_installer=False,
@@ -158,7 +157,7 @@ def trigger_agent_pipeline(
 
     args["RUN_KMT_TESTS"] = "on" if kmt_tests else "off"
 
-    args["RELEASE_VERSION"] = release_version
+    args["RELEASE_VERSION"] = "release"
 
     if branch is not None:
         args["BUCKET_BRANCH"] = branch

tasks/libs/releasing/version.py

@@ -381,7 +381,7 @@ def get_version_numeric_only(ctx, major_version='7'):
     return version
 
 
-def load_release_versions(_, target_version):
+def load_release_versions(_, target_version="release"):
     with open("release.json") as f:
         versions = json.load(f)
         if target_version in versions:

tasks/msi.py

@@ -72,8 +72,8 @@ def _get_vs_build_command(cmd, vstudio_root=None):
     return cmd
 
 
-def _get_env(ctx, major_version='7', release_version='nightly', flavor=None):
-    env = load_release_versions(ctx, release_version)
+def _get_env(ctx, major_version='7', flavor=None):
+    env = load_release_versions(ctx)
 
     if flavor is None:
         flavor = os.getenv("AGENT_FLAVOR", "")
@@ -292,15 +292,14 @@ def build(
     vstudio_root=None,
     arch="x64",
     major_version='7',
-    release_version='nightly',
     flavor=None,
     debug=False,
     build_upgrade=False,
 ):
     """
     Build the MSI installer for the agent
     """
-    env = _get_env(ctx, major_version, release_version, flavor=flavor)
+    env = _get_env(ctx, major_version, flavor=flavor)
     env['OMNIBUS_TARGET'] = 'main'
     configuration = _msbuild_configuration(debug=debug)
     build_outdir = build_out_dir(arch, configuration)
@@ -399,11 +398,11 @@ def build_installer(ctx, vstudio_root=None, arch="x64", debug=False):
 
 
 @task
-def test(ctx, vstudio_root=None, arch="x64", major_version='7', release_version='nightly', debug=False):
+def test(ctx, vstudio_root=None, arch="x64", major_version='7', debug=False):
     """
     Run the unit test for the MSI installer for the agent
     """
-    env = _get_env(ctx, major_version, release_version)
+    env = _get_env(ctx, major_version)
     configuration = _msbuild_configuration(debug=debug)
     build_outdir = build_out_dir(arch, configuration)
 
@@ -498,7 +497,7 @@ def get_msm_info(ctx, release_version):
     """
     Get the merge module info from the release.json for the given release_version
     """
-    env = load_release_versions(ctx, release_version)
+    env = load_release_versions(ctx)
     base_url = "https://s3.amazonaws.com/dd-windowsfilter/builds"
     msm_info = {}
     if 'WINDOWS_DDNPM_VERSION' in env:

tasks/omnibus.py

@@ -76,7 +76,6 @@ def bundle_install_omnibus(ctx, gem_path=None, env=None, max_try=2):
 def get_omnibus_env(
     ctx,
     skip_sign=False,
-    release_version="nightly",
     major_version='7',
     hardened_runtime=False,
     system_probe_bin=None,
@@ -86,7 +85,7 @@ def get_omnibus_env(
     custom_config_dir=None,
     fips_mode=False,
 ):
-    env = load_release_versions(ctx, release_version)
+    env = load_release_versions(ctx)
 
     # If the host has a GOMODCACHE set, try to reuse it
     if not go_mod_cache and os.environ.get('GOMODCACHE'):
@@ -217,7 +216,6 @@ def build(
     env = get_omnibus_env(
         ctx,
         skip_sign=skip_sign,
-        release_version=release_version,
         major_version=major_version,
         hardened_runtime=hardened_runtime,
         system_probe_bin=system_probe_bin,
@@ -350,7 +348,6 @@ def manifest(
     base_dir=None,
     gem_path=None,
     skip_sign=False,
-    release_version="nightly",
     major_version='7',
     hardened_runtime=False,
     system_probe_bin=None,
@@ -363,7 +360,6 @@ def manifest(
     env = get_omnibus_env(
         ctx,
         skip_sign=skip_sign,
-        release_version=release_version,
         major_version=major_version,
         hardened_runtime=hardened_runtime,
         system_probe_bin=system_probe_bin,

tasks/pipeline.py

@@ -153,7 +153,6 @@ def run(
     ctx,
     git_ref="",
     here=False,
-    use_release_entry=False,
     major_versions=None,
     repo_branch="dev",
     deploy=False,
@@ -177,9 +176,6 @@ def run(
     Use --rc-build to mark the build as Release Candidate.
     Use --rc-k8s-deployments to trigger a child pipeline that will deploy Release Candidate build to staging k8s clusters.
 
-    By default, the nightly release.json entry is used.
-    Use the --use-release-entry option to use the release release.json entry instead.
-
     By default, the pipeline builds both Agent 6 and Agent 7.
     Use the --major-versions option to specify a comma-separated string of the major Agent versions to build
     (eg. '6' to build Agent 6 only, '6,7' to build both Agent 6 and Agent 7).
@@ -203,16 +199,14 @@ def run(
       dda inv pipeline.run --here --e2e-tests
 
     Run a deploy pipeline on the 7.32.0 tag, uploading the artifacts to the stable branch of the staging repositories:
-      dda inv pipeline.run --deploy --use-release-entries --major-versions "6,7" --git-ref "7.32.0" --repo-branch "stable"
+      dda inv pipeline.run --deploy --major-versions "6,7" --git-ref "7.32.0" --repo-branch "stable"
     """
 
     repo = get_gitlab_repo()
 
     if (git_ref == "" and not here) or (git_ref != "" and here):
         raise Exit("ERROR: Exactly one of --here or --git-ref <git ref> must be specified.", code=1)
 
-    release_version = "release" if use_release_entry else "nightly"
-
     if major_versions:
         print(
             "[WARNING] --major-versions option will be deprecated soon. Both Agent 6 & 7 will be run everytime.",
@@ -259,7 +253,6 @@ def run(
         pipeline = trigger_agent_pipeline(
             repo,
             git_ref,
-            release_version,
             repo_branch,
             deploy=deploy,
             deploy_installer=deploy_installer,