Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(agent6): Repair the CI build #30234

Merged
merged 12 commits into from
Oct 31, 2024
Merged

fix(agent6): Repair the CI build #30234

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b43fe23
fix(images): Set a new image for agent6
chouetz Oct 8, 2024
04d80e3
update image and gpg keys
chouetz Oct 8, 2024
c5ba481
fix ssm variable names and use dedicated branch for macos
chouetz Oct 9, 2024
2b92672
use latest version of omnibus
chouetz Oct 9, 2024
be2190b
Remove unexpected options from the LD_RUN_PATH
chouetz Oct 10, 2024
2742dfa
fix version
chouetz Oct 11, 2024
aa3d5d0
Use an `official` image version
chouetz Oct 16, 2024
63ffcce
prevent do-not-merge to fail
chouetz Oct 16, 2024
eda0323
remove trace
chouetz Oct 17, 2024
e066f98
change base branch
chouetz Oct 18, 2024
a1c25c6
Revert "Use an `official` image version"
chouetz Oct 18, 2024
f893a89
use latest agent6 images
chouetz Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:v46696172-fa8bb9ad
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down
28 changes: 14 additions & 14 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: v46696172-fa8bb9ad
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_WINBUILDIMAGES: v32015963-09a32ddb
DATADOG_AGENT_WINBUILDIMAGES: v46696172-fa8bb9ad
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_ARMBUILDIMAGES: v32015963-09a32ddb
DATADOG_AGENT_ARMBUILDIMAGES: v46696172-fa8bb9ad
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v32015963-09a32ddb
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v46696172-fa8bb9ad
DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v32015963-09a32ddb
DATADOG_AGENT_KERNEL_MATRIX_TESTING_BUILDIMAGES: v46696172-fa8bb9ad
DATADOG_AGENT_NIKOS_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_NIKOS_BUILDIMAGES: v32015963-09a32ddb
DATADOG_AGENT_NIKOS_BUILDIMAGES: v46696172-fa8bb9ad
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v32015963-09a32ddb
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v46696172-fa8bb9ad
# 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: ""
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/setup/setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []

Expand Down
4 changes: 2 additions & 2 deletions .gitlab/source_test/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion omnibus/config/software/datadog-agent-integrations-py3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']}",
}

Expand Down
12 changes: 6 additions & 6 deletions release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
},
"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",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't support macos in agent6, so I fixed this temporarily but will decommission macos later.

"WINDOWS_DDNPM_DRIVER": "release-signed",
"WINDOWS_DDNPM_VERSION": "2.6.0",
"WINDOWS_DDNPM_SHASUM": "b1611ad4ceb8366c88767aeb638abefb226081efbf546b8b886952dd1b18ec05",
Expand All @@ -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",
Expand Down
6 changes: 2 additions & 4 deletions tasks/libs/common/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,8 @@ def query_version(ctx, git_sha_length=7, prefix=None, major_version_hint=None):
cmd += " --match \"[0-9]*\""
if git_sha_length and type(git_sha_length) == int:
cmd += f" --abbrev={git_sha_length}"
described_version = ctx.run(cmd, hide=True).stdout.strip()
print(f"command is {cmd}")
described_version = ctx.run(cmd).stdout.strip()

# for the example above, 6.0.0-beta.0-1-g4f19118, this will be 1
commit_number_match = re.match(r"^.*-(?P<commit_number>\d+)-g[0-9a-f]+$", described_version)
Expand Down Expand Up @@ -474,10 +475,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")
Expand Down
Loading