Update APT repo path for testing artifacts (#1615)

Author: KevinFairise2

.pre-commit-config.yaml

@@ -2,25 +2,25 @@ repos:
   - repo: https://github.com/golangci/golangci-lint
     rev: v1.55.2
     hooks:
-    - id: golangci-lint
+      - id: golangci-lint
   - repo: local
     hooks:
-    - id: pyright
-      name: pyright
-      entry: pyright
-      language: system  # Use local install for pyright, else we cannot import the requirements and we get errors on external libraries
-      'types_or': [python, pyi]
-      require_serial: true
-      additional_dependencies: []
-      minimum_pre_commit_version: '2.9.2'
+      - id: pyright
+        name: pyright
+        entry: pyright
+        language: system # Use local install for pyright, else we cannot import the requirements and we get errors on external libraries
+        "types_or": [python, pyi]
+        require_serial: true
+        additional_dependencies: []
+        minimum_pre_commit_version: "2.9.2"
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.5
+    rev: v0.12.2
     hooks:
       - id: ruff
-        args: [ --fix ]
+        args: [--fix]
       - id: ruff-format
   - repo: https://github.com/jendrikseipp/vulture
-    rev: 'v2.3'
+    rev: "v2.3"
     hooks:
       - id: vulture
   - repo: local
@@ -34,7 +34,7 @@ repos:
       - id: protected-branches
         name: protected-branches
         description: checks that the commit isn't created on a protected branch
-        entry: 'inv ci.check-protected-branch'
+        entry: "inv ci.check-protected-branch"
         language: system
         pass_filenames: false
         stages: [pre-commit, pre-push]

components/datadog/agent/host_linuxos.go

@@ -30,10 +30,10 @@ func (am *agentLinuxManager) getInstallCommand(version agentparams.PackageVersio
 	testEnvVars := []string{}
 
 	if version.PipelineID != "" {
-		testEnvVars = append(testEnvVars, "TESTING_APT_URL=apttesting.datad0g.com")
+		testEnvVars = append(testEnvVars, fmt.Sprintf("TESTING_APT_URL=apttesting.datad0g.com/datadog-agent/pipeline-%v-a%v", version.PipelineID, version.Major))
 		// apt testing repo
 		// TESTING_APT_REPO_VERSION="pipeline-xxxxx-a7 7"
-		testEnvVars = append(testEnvVars, fmt.Sprintf(`TESTING_APT_REPO_VERSION="pipeline-%[1]v-a%[2]v-%[3]s %[2]v"`, version.PipelineID, version.Major, am.targetOS.Descriptor().Architecture))
+		testEnvVars = append(testEnvVars, fmt.Sprintf(`TESTING_APT_REPO_VERSION="stable-%[1]s %[2]v"`, am.targetOS.Descriptor().Architecture, version.Major))
 		testEnvVars = append(testEnvVars, "TESTING_YUM_URL=yumtesting.datad0g.com")
 		// yum testing repo
 		// TESTING_YUM_VERSION_PATH="testing/pipeline-xxxxx-a7/7"

components/datadog/updater/install_script.sh

@@ -16,8 +16,8 @@ DD_INSTALLER_REGISTRY_URL_AGENT_PACKAGE="669783387624.dkr.ecr.us-east-1.amazonaw
 DD_INSTALLER_REGISTRY_AUTH_AGENT_PACKAGE="ecr" \
 DD_INSTALLER_DEFAULT_PKG_VERSION_DATADOG_AGENT="pipeline-${DD_PIPELINE_ID}" \
 TESTING_KEYS_URL="keys.datadoghq.com" \
-TESTING_APT_URL="apttesting.datad0g.com" \
-TESTING_APT_REPO_VERSION="pipeline-${DD_PIPELINE_ID}-a7-$(uname -m | sed 's/aarch64/arm64/; s/amd64/x86_64/') 7" \
+TESTING_APT_URL="apttesting.datad0g.com/datadog-agent/pipeline-${DD_PIPELINE_ID}-a7" \
+TESTING_APT_REPO_VERSION="stable-$(uname -m | sed 's/aarch64/arm64/; s/amd64/x86_64/') 7" \
 TESTING_YUM_URL="yumtesting.datad0g.com" \
 TESTING_YUM_VERSION_PATH="testing/pipeline-${DD_PIPELINE_ID}-a7/7" \
 bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"

go.mod

@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	dario.cat/mergo v1.0.1
-	github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd
+	github.com/DataDog/datadog-agent/pkg/util/option v0.67.0
 	github.com/Masterminds/semver v1.5.0
 	github.com/alessio/shellescape v1.4.2
 	github.com/aws/aws-sdk-go-v2 v1.32.7

go.sum

@@ -2,8 +2,8 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
 dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd h1:kam3LA9L/VuBRPQLqW4CBnelpxF1KY4WGbb/W2UHn2g=
-github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd/go.mod h1:BECd5pnMX9MEnARCAV+S7M0Sk/gYwopL7QlhCFdXSI0=
+github.com/DataDog/datadog-agent/pkg/util/option v0.67.0 h1:8WQBb4AOO7LGIbCnJsQZSP0xv/V9ELfe5pbgkOoak+Q=
+github.com/DataDog/datadog-agent/pkg/util/option v0.67.0/go.mod h1:BQJ+P1ycpK/T1DQvvPWle4ZkJ/QDLxg4pHzXnpfrUwY=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=

tasks/deploy.py

@@ -91,10 +91,10 @@ def check_s3_image_exists(_, pipeline_id: str, deploy_job: str):
     # Job to s3 directory mapping
     deploy_job_to_s3 = {
         # Deb
-        "deploy_deb_testing-a7_x64": f"apttesting.datad0g.com/dists/pipeline-{pipeline_id}-a7-x86_64/7/binary-x86_64",
-        "deploy_deb_testing-a7_arm64": f"apttesting.datad0g.com/dists/pipeline-{pipeline_id}-a7-arm64/7/binary-arm64",
-        "deploy_deb_testing-a6_x64": f"apttesting.datad0g.com/dists/pipeline-{pipeline_id}-a6-x86_64/6/binary-x86_64",
-        "deploy_deb_testing-a6_arm64": f"apttesting.datad0g.com/dists/pipeline-{pipeline_id}-a6-arm64/6/binary-arm64",
+        "deploy_deb_testing-a7_x64": f"apttesting.datad0g.com/datadog-agent/pipeline-{pipeline_id}-a7/dists/stable-x86_64/7/binary-amd64",
+        "deploy_deb_testing-a7_arm64": f"apttesting.datad0g.com/datadog-agent/pipeline-{pipeline_id}-a7/dists/stable-arm64/7/binary-arm64",
+        "deploy_deb_testing-a6_x64": f"apttesting.datad0g.com/datadog-agent/pipeline-{pipeline_id}-a6/dists/stable-x86_64/6/binary-amd64",
+        "deploy_deb_testing-a6_arm64": f"apttesting.datad0g.com/datadog-agent/pipeline-{pipeline_id}-a6/dists/stable-arm64/6/binary-arm64",
         # Rpm
         "deploy_rpm_testing-a7_x64": f"yumtesting.datad0g.com/testing/pipeline-{pipeline_id}-a7/7/x86_64",
         "deploy_rpm_testing-a7_arm64": f"yumtesting.datad0g.com/testing/pipeline-{pipeline_id}-a7/7/aarch64",