Skip to content

Commit 353f4bf

Browse files
remove release_version everywhere
1 parent 4430669 commit 353f4bf

32 files changed

+75
-193
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ variables:
161161
BTFHUB_ARCHIVE_BRANCH: main
162162
GENERAL_ARTIFACTS_CACHE_BUCKET_URL: https://dd-agent-omnibus.s3.amazonaws.com
163163
S3_DSD6_URI: s3://dsd6-staging
164-
RELEASE_VERSION: nightly
165164

166165
# Build images versions
167166
# To use images from datadog-agent-buildimages dev branches, set the corresponding

.gitlab/binary_build/cluster_agent.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
.cluster_agent-build_common:
33
stage: binary_build
4-
rules:
4+
rules:
55
- !reference [.except_mergequeue]
66
- when: on_success
77
needs: ["go_mod_tidy_check", "go_deps"]
88
before_script:
99
- !reference [.retrieve_linux_go_deps]
1010
script:
1111
- dda inv -- check-go-version
12-
- dda inv -- -e cluster-agent.build --release-version "$RELEASE_VERSION"
12+
- dda inv -- -e cluster-agent.build
1313
artifacts:
1414
paths:
1515
- $CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent

.gitlab/package_build/dmg.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
.agent_build_common_dmg:
33
script:
4-
- echo "About to build for $RELEASE_VERSION"
4+
- echo "About to build with pinned dependencies"
55
# remove artifacts from previous pipelines that may come from the cache
66
- rm -rf $OMNIBUS_PACKAGE_DIR/*
77
- mkdir -p $OMNIBUS_PACKAGE_DIR
@@ -10,7 +10,7 @@
1010
- export VERSION_CACHE_CONTENT=$(cat agent-version.cache | base64 -)
1111
- python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat .dda/version)"
1212
- python3 -m dda self dep sync -f legacy-tasks
13-
- dda inv -- -e github.trigger-macos --workflow-type "build" --datadog-agent-ref "$CI_COMMIT_SHA" --release-version "$RELEASE_VERSION" --destination "$OMNIBUS_PACKAGE_DIR" --version-cache "$VERSION_CACHE_CONTENT" --integrations-core-ref "$INTEGRATIONS_CORE_VERSION"
13+
- dda inv -- -e github.trigger-macos --workflow-type "build" --datadog-agent-ref "$CI_COMMIT_SHA" --destination "$OMNIBUS_PACKAGE_DIR" --version-cache "$VERSION_CACHE_CONTENT" --integrations-core-ref "$INTEGRATIONS_CORE_VERSION"
1414
- !reference [.upload_sbom_artifacts]
1515
timeout: 3h # MacOS builds can take 1h~2h, increase the timeout to avoid timeout flakes
1616
artifacts:

.gitlab/package_build/heroku.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
script:
1717
- !reference [.retrieve_linux_go_deps]
1818
- !reference [.cache_omnibus_ruby_deps, setup]
19-
- echo "About to build for $RELEASE_VERSION"
19+
- echo "About to build with pinned dependencies"
2020
# remove artifacts from previous pipelines that may come from the cache
2121
- rm -rf $OMNIBUS_PACKAGE_DIR/*
2222
# Artifacts and cache must live within project directory but we run omnibus in a neutral directory.
@@ -28,7 +28,7 @@
2828
- ${S3_CP_CMD} "${S3_PERMANENT_ARTIFACTS_URI}/llc-${CLANG_LLVM_VER}.${PACKAGE_ARCH}.${CLANG_BUILD_VERSION}" /tmp/system-probe/llc-bpf
2929
- cp $CI_PROJECT_DIR/minimized-btfs.tar.xz /tmp/system-probe/minimized-btfs.tar.xz
3030
- chmod 0744 /tmp/system-probe/clang-bpf /tmp/system-probe/llc-bpf
31-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --system-probe-bin=/tmp/system-probe --flavor heroku
31+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --system-probe-bin=/tmp/system-probe --flavor heroku
3232
- ls -la $OMNIBUS_PACKAGE_DIR
3333
- !reference [.create_signature_and_lint_linux_packages]
3434
- !reference [.upload_sbom_artifacts]

.gitlab/package_build/installer.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
.common_build_oci:
66
script:
7-
- echo "About to build for $RELEASE_VERSION"
7+
- echo "About to build with pinned dependencies"
88
- AGENT_VERSION="$(dda inv agent.version -u)-1" || exit $?
99
- export INSTALL_DIR=/opt/datadog-packages/datadog-agent/"$AGENT_VERSION"
1010
- !reference [.retrieve_linux_go_deps]
@@ -21,7 +21,7 @@
2121
- chmod 0744 /tmp/system-probe/clang-bpf /tmp/system-probe/llc-bpf
2222
# NOTE: for now, we consider "ociru" to be a "redhat_target" in omnibus/lib/ostools.rb
2323
# if we ever start building on a different platform, that might need to change
24-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --system-probe-bin=/tmp/system-probe --host-distribution=ociru --install-directory="$INSTALL_DIR"
24+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --system-probe-bin=/tmp/system-probe --host-distribution=ociru --install-directory="$INSTALL_DIR"
2525
- ls -la $OMNIBUS_PACKAGE_DIR
2626
- !reference [.upload_sbom_artifacts]
2727
variables:
@@ -140,12 +140,12 @@ powershell_script_signing:
140140
script:
141141
- !reference [.retrieve_linux_go_deps]
142142
- !reference [.cache_omnibus_ruby_deps, setup]
143-
- echo "About to build for $RELEASE_VERSION"
143+
- echo "About to build with pinned dependencies"
144144
# remove artifacts from previous pipelines that may come from the cache
145145
- rm -rf $OMNIBUS_PACKAGE_DIR/*
146146
# Artifacts and cache must live within project directory but we run omnibus in a neutral directory.
147147
# Thus, we move the artifacts at the end in a gitlab-friendly dir.
148-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project="installer" ${INSTALL_DIR_PARAM}
148+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project="installer" ${INSTALL_DIR_PARAM}
149149
- ls -la $OMNIBUS_PACKAGE_DIR
150150
- !reference [.upload_sbom_artifacts]
151151
variables:
@@ -233,7 +233,6 @@ windows-installer-amd64:
233233
-e CI_JOB_NAME_SLUG=${CI_JOB_NAME_SLUG}
234234
-e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
235235
-e WINDOWS_BUILDER=true
236-
-e RELEASE_VERSION="$RELEASE_VERSION"
237236
-e GOMODCACHE="c:\modcache"
238237
-e AWS_NETWORKING=true
239238
-e SIGN_WINDOWS_DD_WCS=true

.gitlab/package_build/linux.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.agent_build_script:
2-
- echo "About to build for $RELEASE_VERSION"
2+
- echo "About to build with pinned dependencies"
33
- !reference [.retrieve_linux_go_deps]
44
- !reference [.cache_omnibus_ruby_deps, setup]
55
# remove artifacts from previous pipelines that may come from the cache
@@ -12,7 +12,7 @@
1212
- ${S3_CP_CMD} "${S3_PERMANENT_ARTIFACTS_URI}/llc-${CLANG_LLVM_VER}.${PACKAGE_ARCH}.${CLANG_BUILD_VERSION}" /tmp/system-probe/llc-bpf
1313
- cp $CI_PROJECT_DIR/minimized-btfs.tar.xz /tmp/system-probe/minimized-btfs.tar.xz
1414
- chmod 0744 /tmp/system-probe/clang-bpf /tmp/system-probe/llc-bpf
15-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --system-probe-bin=/tmp/system-probe --flavor "$FLAVOR" --config-directory "$CONFIG_DIR" --install-directory "$INSTALL_DIR"
15+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --system-probe-bin=/tmp/system-probe --flavor "$FLAVOR" --config-directory "$CONFIG_DIR" --install-directory "$INSTALL_DIR"
1616
- ls -la $OMNIBUS_PACKAGE_DIR
1717
- !reference [.upload_sbom_artifacts]
1818

@@ -83,12 +83,12 @@ datadog-agent-7-arm64-fips:
8383
extends: .agent_build_common
8484
needs: ["go_mod_tidy_check", "go_deps"]
8585
script:
86-
- echo "About to build for $RELEASE_VERSION"
86+
- echo "About to build with pinned dependencies"
8787
- !reference [.retrieve_linux_go_deps]
8888
- !reference [.cache_omnibus_ruby_deps, setup]
8989
# remove artifacts from previous pipelines that may come from the cache
9090
- rm -rf $OMNIBUS_PACKAGE_DIR/*
91-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --system-probe-bin=/tmp/system-probe --flavor iot
91+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --system-probe-bin=/tmp/system-probe --flavor iot
9292
- ls -la $OMNIBUS_PACKAGE_DIR
9393
- !reference [.upload_sbom_artifacts]
9494

@@ -126,12 +126,12 @@ iot-agent-armhf:
126126
- when: on_success
127127
stage: package_build
128128
script:
129-
- echo "About to build for $RELEASE_VERSION"
129+
- echo "About to build with pinned dependencies"
130130
- !reference [.retrieve_linux_go_deps]
131131
- !reference [.cache_omnibus_ruby_deps, setup]
132132
# remove artifacts from previous pipelines that may come from the cache
133133
- rm -rf $OMNIBUS_PACKAGE_DIR/*
134-
- dda inv -- -e omnibus.build --release-version $RELEASE_VERSION --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project dogstatsd
134+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project dogstatsd
135135
- ls -la $OMNIBUS_PACKAGE_DIR
136136
- !reference [.upload_sbom_artifacts]
137137
variables:
@@ -168,12 +168,12 @@ dogstatsd-arm64:
168168
- when: on_success
169169
stage: package_build
170170
script:
171-
- echo "About to build for $RELEASE_VERSION"
171+
- echo "About to build with pinned dependencies"
172172
- !reference [.retrieve_linux_go_deps]
173173
- !reference [.cache_omnibus_ruby_deps, setup]
174174
# remove artifacts from previous pipelines that may come from the cache
175175
- rm -rf $OMNIBUS_PACKAGE_DIR/*
176-
- dda inv -- -e omnibus.build --release-version $RELEASE_VERSION --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project otel-agent
176+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project otel-agent
177177
- ls -la $OMNIBUS_PACKAGE_DIR
178178
- !reference [.upload_sbom_artifacts]
179179
variables:

.gitlab/package_build/windows.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
-e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
2121
-e OMNIBUS_TARGET=${OMNIBUS_TARGET}
2222
-e WINDOWS_BUILDER=true
23-
-e RELEASE_VERSION="$RELEASE_VERSION"
2423
-e MAJOR_VERSION="7"
2524
-e INTEGRATIONS_CORE_VERSION="$INTEGRATIONS_CORE_VERSION"
2625
-e GOMODCACHE="c:\modcache"
@@ -103,7 +102,6 @@ windows_zip_agent_binaries_x64-a7:
103102
-e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
104103
-e OMNIBUS_TARGET=${OMNIBUS_TARGET}
105104
-e WINDOWS_BUILDER=true
106-
-e RELEASE_VERSION="$RELEASE_VERSION"
107105
-e MAJOR_VERSION="7"
108106
-e INTEGRATIONS_CORE_VERSION="$INTEGRATIONS_CORE_VERSION"
109107
-e GOMODCACHE="c:\modcache"

.gitlab/packaging/deb.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
stage: packaging
44
script:
55
- !reference [.cache_omnibus_ruby_deps, setup]
6-
- echo "About to package for $RELEASE_VERSION"
6+
- echo "About to package with pinned dependencies"
77
- !reference [.setup_deb_signing_key]
8-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project ${DD_PROJECT} ${OMNIBUS_EXTRA_ARGS}
8+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project ${DD_PROJECT} ${OMNIBUS_EXTRA_ARGS}
99
- !reference [.create_signature_and_lint_linux_packages]
1010
artifacts:
1111
expire_in: 2 weeks
@@ -76,9 +76,9 @@ agent_deb-arm64-a7-fips:
7676
extends: [.package_deb_common]
7777
script:
7878
- !reference [.cache_omnibus_ruby_deps, setup]
79-
- echo "About to package for $RELEASE_VERSION"
79+
- echo "About to package with pinned dependencies"
8080
- !reference [.setup_deb_signing_key]
81-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project ${DD_PROJECT} --flavor ot ${OMNIBUS_EXTRA_ARGS}
81+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project ${DD_PROJECT} --flavor ot ${OMNIBUS_EXTRA_ARGS}
8282
- !reference [.create_signature_and_lint_linux_packages]
8383

8484
ot_agent_deb-x64-a7:
@@ -128,9 +128,9 @@ installer_deb-arm64:
128128
stage: packaging
129129
script:
130130
- !reference [.cache_omnibus_ruby_deps, setup]
131-
- echo "About to package for $RELEASE_VERSION"
131+
- echo "About to package with pinned dependencies"
132132
- !reference [.setup_deb_signing_key]
133-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --flavor iot
133+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --flavor iot
134134
- !reference [.create_signature_and_lint_linux_packages]
135135
artifacts:
136136
expire_in: 2 weeks

.gitlab/packaging/rpm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
- when: on_success
77
before_script:
88
script:
9-
- echo "About to build for $RELEASE_VERSION"
9+
- echo "About to build with pinned dependencies"
1010
- !reference [.cache_omnibus_ruby_deps, setup]
1111
- printf -- "$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_GPG_KEY)" | gpg --import --batch
1212
- EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials needs gitlab runner restart"; exit $EXIT; fi
1313
- RPM_SIGNING_PASSPHRASE=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_SIGNING_PASSPHRASE) || exit $?; export RPM_SIGNING_PASSPHRASE
14-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project=${DD_PROJECT} ${OMNIBUS_EXTRA_ARGS}
14+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project=${DD_PROJECT} ${OMNIBUS_EXTRA_ARGS}
1515
- ls -la $OMNIBUS_PACKAGE_DIR/
1616
- !reference [.create_signature_and_lint_linux_packages]
1717
stage: packaging
@@ -143,12 +143,12 @@ installer_suse_rpm-arm64:
143143
- !reference [.except_mergequeue]
144144
- when: on_success
145145
script:
146-
- echo "About to build for $RELEASE_VERSION"
146+
- echo "About to build with pinned dependencies"
147147
- !reference [.cache_omnibus_ruby_deps, setup]
148148
- printf -- "$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_GPG_KEY)" | gpg --import --batch
149149
- EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials needs gitlab runner restart"; exit $EXIT; fi
150150
- RPM_SIGNING_PASSPHRASE=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_SIGNING_PASSPHRASE) || exit $?; export RPM_SIGNING_PASSPHRASE
151-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --flavor=iot ${OMNIBUS_EXTRA_ARGS}
151+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --flavor=iot ${OMNIBUS_EXTRA_ARGS}
152152
- ls -la $OMNIBUS_PACKAGE_DIR/
153153
- !reference [.create_signature_and_lint_linux_packages]
154154
stage: packaging

Dockerfiles/agent/windows/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ How to build the Agent docker image
66
From the root of the repository, run the following command:
77

88
```
9-
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 powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1 -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1"
9+
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 powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1 -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1"
1010
```
1111

1212
The build artifacts will be in `omnibus\pkg`.

docs/dev/agent_omnibus.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Start a Powershell prompt and navigate to your local clone of the `datadog-agent
9595
Run the following command:
9696

9797
```powershell
98-
docker run -v "$(Get-Location):c:\mnt" -e OMNIBUS_TARGET=main -e RELEASE_VERSION=nightly -e MAJOR_VERSION=7 -e TARGET_ARCH=x64 datadog/agent-buildimages-windows_x64:1809 powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1 -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1"
98+
docker run -v "$(Get-Location):c:\mnt" -e OMNIBUS_TARGET=main -e MAJOR_VERSION=7 -e TARGET_ARCH=x64 datadog/agent-buildimages-windows_x64:1809 powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1 -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1"
9999
```
100100

101101
Downloading the Docker image may take some time in the first run.
@@ -105,7 +105,6 @@ Alternatively here's a small Powershell script to facilitate using the docker im
105105
param (
106106
[int]$MAJOR_VERSION=7,
107107
$TARGET_ARCH="x64",
108-
$RELEASE_VERSION="nightly",
109108
[bool]$RM_CONTAINER=$true,
110109
[bool]$DEBUG=$false
111110
)
@@ -114,7 +113,7 @@ $cmd = "docker run"
114113
if ($RM_CONTAINER) {
115114
$cmd += " --rm "
116115
}
117-
$opts = "-e OMNIBUS_TARGET=main -e RELEASE_VERSION=$RELEASE_VERSION -e MAJOR_VERSION=$MAJOR_VERSION -e TARGET_ARCH=$TARGET_ARCH"
116+
$opts = "-e OMNIBUS_TARGET=main -e MAJOR_VERSION=$MAJOR_VERSION -e TARGET_ARCH=$TARGET_ARCH"
118117
if ($DEBUG) {
119118
$opts += " -e DEBUG_CUSTOMACTION=yes "
120119
}

release.json

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"6": "6.53.1",
66
"7": "7.64.2"
77
},
8-
"nightly": {
8+
"dependencies":{
99
"OMNIBUS_RUBY_VERSION": "95630818722a63cb9e6f3163984f363d799633a1",
1010
"JMXFETCH_VERSION": "0.49.6",
1111
"JMXFETCH_HASH": "f06bdac1f8ec41daf9b9839ac883f1865a068b04810ea82197b8a6afb9369cb9",
@@ -19,20 +19,6 @@
1919
"WINDOWS_DDPROCMON_SHASUM": "e5525959521254ba8218f64f644ad19cdeb720aa48ee83eb5e402a8d1643e32e",
2020
"INTEGRATIONS_CORE_VERSION": "ed2c86a680621dfc5416a1751b6bc20cd8841c4b"
2121
},
22-
"release": {
23-
"INTEGRATIONS_CORE_VERSION": "7.56.0-rc.2",
24-
"OMNIBUS_RUBY_VERSION": "7.56.0-rc.1",
25-
"JMXFETCH_VERSION": "0.49.6",
26-
"JMXFETCH_HASH": "f06bdac1f8ec41daf9b9839ac883f1865a068b04810ea82197b8a6afb9369cb9",
27-
"SECURITY_AGENT_POLICIES_VERSION": "v0.65.0",
28-
"MACOS_BUILD_VERSION": "7.56.0-rc.3",
29-
"WINDOWS_DDNPM_DRIVER": "release-signed",
30-
"WINDOWS_DDNPM_VERSION": "2.7.1",
31-
"WINDOWS_DDNPM_SHASUM": "0f4665761324e1fef1c21651be5b70e79c72b5e7e5662d74619e7db2b27d5bc2",
32-
"WINDOWS_DDPROCMON_DRIVER": "release-signed",
33-
"WINDOWS_DDPROCMON_VERSION": "1.2.0",
34-
"WINDOWS_DDPROCMON_SHASUM": "e5525959521254ba8218f64f644ad19cdeb720aa48ee83eb5e402a8d1643e32e"
35-
},
3622
"dca-1.17.0": {
3723
"SECURITY_AGENT_POLICIES_VERSION": "v0.18.6"
3824
},

tasks/cluster_agent.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from tasks.cluster_agent_helpers import build_common, clean_common, refresh_assets_common, version_common
1717
from tasks.cws_instrumentation import BIN_PATH as CWS_INSTRUMENTATION_BIN_PATH
1818
from tasks.gointegrationtest import CLUSTER_AGENT_IT_CONF, containerized_integration_tests
19-
from tasks.libs.releasing.version import load_release_versions
19+
from tasks.libs.releasing.version import load_dependencies
2020

2121
# constants
2222
BIN_PATH = os.path.join(".", "bin", "datadog-cluster-agent")
@@ -35,7 +35,6 @@ def build(
3535
development=True,
3636
skip_assets=False,
3737
policies_version=None,
38-
release_version="nightly",
3938
):
4039
"""
4140
Build Cluster Agent
@@ -57,11 +56,11 @@ def build(
5756
)
5857

5958
if policies_version is None:
60-
print(f"Loading release versions for {release_version}")
61-
env = load_release_versions(ctx, release_version)
59+
print(f"Loading dependencies from release.json")
60+
env = load_dependencies(ctx)
6261
if "SECURITY_AGENT_POLICIES_VERSION" in env:
6362
policies_version = env["SECURITY_AGENT_POLICIES_VERSION"]
64-
print(f"Security Agent polices for {release_version}: {policies_version}")
63+
print(f"Security Agent polices: {policies_version}")
6564

6665
build_context = "Dockerfiles/cluster-agent"
6766
policies_path = f"{build_context}/security-agent-policies"

0 commit comments

Comments
 (0)