fix(agent6): Repair the CI build (#30234)

DataDog · Oct 31, 2024 · f81f1a3 · f81f1a3
1 parent 70161b4
commit f81f1a3
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 31 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v32015963-09a32ddb
+      - image: gcr.io/datadoghq/agent-circleci-runner:v47817366-5fdf0325
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -161,19 +161,19 @@ variables:
   # To use images from datadog-agent-buildimages dev branches, set the corresponding
   # SUFFIX variable to _test_only
   DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BUILDIMAGES: v32015963-09a32ddb
+  DATADOG_AGENT_BUILDIMAGES: v47817366-5fdf0325
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v32015963-09a32ddb
+  DATADOG_AGENT_WINBUILDIMAGES: v47817366-5fdf0325
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v32015963-09a32ddb
+  DATADOG_AGENT_ARMBUILDIMAGES: v47817366-5fdf0325
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v32015963-09a32ddb
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v47817366-5fdf0325
   DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v32015963-09a32ddb
+  DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v47817366-5fdf0325
   DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_NIKOS_BUILDIMAGES: v32015963-09a32ddb
+  DATADOG_AGENT_NIKOS_BUILDIMAGES: v47817366-5fdf0325
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v32015963-09a32ddb
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v47817366-5fdf0325
   # To use images from test-infra-definitions dev branches, set the SUFFIX variable to -dev
   # and check the job creating the image to make sure you have the right SHA prefix
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""
@@ -182,9 +182,9 @@ variables:
   DATADOG_AGENT_BUILDERS: v28719426-b6a4fd9
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
-  DEB_GPG_KEY_ID: ad9589b7
-  DEB_GPG_KEY_NAME: "Datadog, Inc. Master key"
-  RPM_GPG_KEY_ID: fd4bf915
+  DEB_GPG_KEY_ID: c0962c7d
+  DEB_GPG_KEY_NAME: "Datadog, Inc. APT key"
+  RPM_GPG_KEY_ID: b01082d3
   RPM_GPG_KEY_NAME: "Datadog, Inc. RPM key"
   DOCKER_REGISTRY_URL: docker.io
   KITCHEN_INFRASTRUCTURE_FLAKES_RETRY: 2
@@ -211,8 +211,8 @@ variables:
   ARTIFACTORY_BYPASS_SSM_NAME: ci.datadog-agent.artifactory_bypass  # agent-ci-experience
   CHANGELOG_COMMIT_SHA_SSM_NAME: ci.datadog-agent.changelog_commit_sha  # agent-ci-experience
   CHOCOLATEY_API_KEY_SSM_NAME: ci.datadog-agent.chocolatey_api_key  # windows-agent
-  DEB_GPG_KEY_SSM_NAME: ci.datadog-agent.deb_signing_private_key_v2_${DEB_GPG_KEY_ID}  # agent-build-and-release
-  DEB_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.deb_signing_key_passphrase_v2_${DEB_GPG_KEY_ID}  # agent-build-and-release
+  DEB_GPG_KEY_SSM_NAME: ci.datadog-agent.deb_signing_private_key_${DEB_GPG_KEY_ID}  # agent-build-and-release
+  DEB_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.deb_signing_key_passphrase_${DEB_GPG_KEY_ID}  # agent-build-and-release
   DOCKER_REGISTRY_LOGIN_SSM_KEY: ci.datadog-agent.docker_hub_login  # agent-ci-experience
   DOCKER_REGISTRY_PWD_SSM_KEY: ci.datadog-agent.docker_hub_pwd  # agent-ci-experience
   E2E_TESTS_API_KEY_SSM_NAME: ci.datadog-agent.e2e_tests_api_key  # agent-developer-tools
@@ -230,8 +230,8 @@ variables:
   MACOS_GITHUB_APP_ID_SSM_NAME: ci.datadog-agent.macos_github_app_id  # agent-ci-experience
   MACOS_GITHUB_INSTALLATION_ID_SSM_NAME: ci.datadog-agent.macos_github_installation_id  # agent-ci-experience
   MACOS_GITHUB_KEY_SSM_NAME: ci.datadog-agent.macos_github_key_b64  # agent-ci-experience
-  RPM_GPG_KEY_SSM_NAME: ci.datadog-agent.rpm_signing_private_key_v2_${RPM_GPG_KEY_ID}  # agent-build-and-release
-  RPM_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.rpm_signing_key_passphrase_v2_${RPM_GPG_KEY_ID}  # agent-build-and-release
+  RPM_GPG_KEY_SSM_NAME: ci.datadog-agent.rpm_signing_private_key_${RPM_GPG_KEY_ID}  # agent-build-and-release
+  RPM_SIGNING_PASSPHRASE_SSM_NAME: ci.datadog-agent.rpm_signing_key_passphrase_${RPM_GPG_KEY_ID}  # agent-build-and-release
   SMP_ACCOUNT_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-account-id  # single-machine-performance
   SMP_AGENT_TEAM_ID_SSM_NAME: ci.datadog-agent.single-machine-performance-agent-team-id  # single-machine-performance
   SMP_API_SSM_NAME: ci.datadog-agent.single-machine-performance-api  # single-machine-performance

diff --git a/.gitlab/setup/setup.yml b/.gitlab/setup/setup.yml
@@ -5,7 +5,7 @@ setup_agent_version:
   tags: ["arch:amd64"]
   script:
     - source /root/.bashrc
-    - inv -e agent.version --version-cached
+    - inv -e agent.version -m 6 --version-cached
     - $S3_CP_CMD $CI_PROJECT_DIR/agent-version.cache $S3_ARTIFACTS_URI/agent-version.cache
   needs: []
 

diff --git a/.gitlab/source_test/linux.yml b/.gitlab/source_test/linux.yml
@@ -160,7 +160,7 @@ tests_rpm-x64-py2:
   rules:
     - !reference [.except_disable_unit_tests]
     - !reference [.on_a6]
-  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_x64_testing$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
+  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   variables:
     PYTHON_RUNTIMES: '2'
@@ -171,7 +171,7 @@ tests_rpm-x64-py3:
   extends:
     - .rtloader_tests
     - .linux_tests_with_upload
-  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_x64_testing$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
+  image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/rpm_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   tags: ["arch:amd64"]
   variables:
     PYTHON_RUNTIMES: '3'

diff --git a/omnibus/config/software/datadog-agent-integrations-py3.rb b/omnibus/config/software/datadog-agent-integrations-py3.rb
@@ -120,7 +120,7 @@
     "CFLAGS" => "-I#{install_dir}/embedded/include -I/opt/mqm/inc",
     "CXXFLAGS" => "-I#{install_dir}/embedded/include -I/opt/mqm/inc",
     "LDFLAGS" => "-L#{install_dir}/embedded/lib -L/opt/mqm/lib64 -L/opt/mqm/lib",
-    "LD_RUN_PATH" => "#{install_dir}/embedded/lib -L/opt/mqm/lib64 -L/opt/mqm/lib",
+    "LD_RUN_PATH" => "#{install_dir}/embedded/lib",
     "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}",
   }
 

diff --git a/release.json b/release.json
@@ -1,17 +1,17 @@
 {
-    "base_branch": "7.53.x",
-    "current_milestone": "7.53.0",
+    "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_SOFTWARE_VERSION": "7.53.x",
-        "OMNIBUS_RUBY_VERSION": "7.53.x",
+        "OMNIBUS_SOFTWARE_VERSION": "375618d70253293d71b13f9385260aa3dedd7125",
+        "OMNIBUS_RUBY_VERSION": "bc5e0fb395c4b106967f97f8738d23705e5bc933",
         "JMXFETCH_VERSION": "0.49.0",
         "JMXFETCH_HASH": "b5c2c3ff27603f469bb11961d559f1154887963e02b9d70d5f1fc7efa527a486",
-        "MACOS_BUILD_VERSION": "7.53.x",
+        "MACOS_BUILD_VERSION": "nschweitzer/master",
         "WINDOWS_DDNPM_DRIVER": "release-signed",
         "WINDOWS_DDNPM_VERSION": "2.6.0",
         "WINDOWS_DDNPM_SHASUM": "b1611ad4ceb8366c88767aeb638abefb226081efbf546b8b886952dd1b18ec05",
@@ -26,11 +26,11 @@
     },
     "nightly-a7": {
         "INTEGRATIONS_CORE_VERSION": "7.53.x",
-        "OMNIBUS_SOFTWARE_VERSION": "7.53.x",
-        "OMNIBUS_RUBY_VERSION": "7.53.x",
+        "OMNIBUS_SOFTWARE_VERSION": "375618d70253293d71b13f9385260aa3dedd7125",
+        "OMNIBUS_RUBY_VERSION": "bc5e0fb395c4b106967f97f8738d23705e5bc933",
         "JMXFETCH_VERSION": "0.49.0",
         "JMXFETCH_HASH": "b5c2c3ff27603f469bb11961d559f1154887963e02b9d70d5f1fc7efa527a486",
-        "MACOS_BUILD_VERSION": "7.53.x",
+        "MACOS_BUILD_VERSION": "nschweitzer/master",
         "WINDOWS_DDNPM_DRIVER": "release-signed",
         "WINDOWS_DDNPM_VERSION": "2.6.0",
         "WINDOWS_DDNPM_SHASUM": "b1611ad4ceb8366c88767aeb638abefb226081efbf546b8b886952dd1b18ec05",

diff --git a/tasks/libs/common/utils.py b/tasks/libs/common/utils.py
@@ -474,10 +474,7 @@ def get_version(
     pipeline_id=None,
     include_git=False,
     include_pre=True,
-    fake_condition=True,
 ):
-    if fake_condition:
-        return "7.53.0"
     version = ""
     if pipeline_id is None:
         pipeline_id = os.getenv("CI_PIPELINE_ID")

diff --git a/tasks/release.py b/tasks/release.py
@@ -1575,7 +1575,7 @@ def cleanup(ctx):
 @task
 def check_omnibus_branches(ctx):
     base_branch = _get_release_json_value('base_branch')
-    if base_branch == 'main':
+    if base_branch == '6.53.x':
         omnibus_ruby_branch = 'datadog-5.5.0'
         omnibus_software_branch = 'master'
     else: