Skip to content

Commit 59cb01a

Browse files
[BARX-661] remove --use-release-entries and release_version from everywhere (#36143)
1 parent 5d39efe commit 59cb01a

33 files changed

+119
-390
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ variables:
163163
COMPARE_TO_BRANCH: main
164164
GENERAL_ARTIFACTS_CACHE_BUCKET_URL: https://dd-agent-omnibus.s3.amazonaws.com
165165
S3_DSD6_URI: s3://dsd6-staging
166-
RELEASE_VERSION: nightly
167166

168167
# Build images versions
169168
# 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/notify/notify.yml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -54,39 +54,6 @@ send_pipeline_stats:
5454
- !reference [.notify_setup]
5555
- dda inv -- -e notify.send-stats
5656

57-
notify_github:
58-
extends: .notify-job
59-
image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
60-
tags: ["arch:arm64"]
61-
rules:
62-
- !reference [.on_dev_branches]
63-
- if: $RELEASE_VERSION != ""
64-
changes:
65-
paths:
66-
- '**/*.go'
67-
compare_to: $COMPARE_TO_BRANCH
68-
when: on_success
69-
- when: never
70-
needs:
71-
- job: "deploy_deb_testing-a7_x64"
72-
optional: true
73-
dependencies: []
74-
script:
75-
- !reference [.setup_agent_github_app]
76-
# Python 3.12 changes default behavior how packages are installed.
77-
# In particular, --break-system-packages command line option is
78-
# required to use the old behavior or use a virtual env. https://github.com/actions/runner-images/issues/8615
79-
- python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat .dda/version)" --break-system-packages
80-
- python3 -m dda self dep sync -f legacy-tasks
81-
- messagefile="$(mktemp)"
82-
- echo "Use this command from [test-infra-definitions](https://github.com/DataDog/test-infra-definitions) to manually test this PR changes on a VM:" >> "$messagefile"
83-
- echo '```sh' >> "$messagefile"
84-
- echo "dda inv aws.create-vm --pipeline-id=$CI_PIPELINE_ID --os-family=ubuntu" >> "$messagefile"
85-
- echo '```' >> "$messagefile"
86-
- 'echo "Note: This applies to commit **$CI_COMMIT_SHORT_SHA**" >> "$messagefile"'
87-
- dda inv -- -e github.pr-commenter --title "Test changes on VM" --body "$(cat "$messagefile")" --echo
88-
- rm "$messagefile"
89-
9057
notify_gitlab_ci_changes:
9158
image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
9259
extends: .notify-job

.gitlab/package_build/dmg.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
.agent_build_common_dmg:
33
script:
4-
- echo "About to build for $RELEASE_VERSION"
54
# remove artifacts from previous pipelines that may come from the cache
65
- rm -rf $OMNIBUS_PACKAGE_DIR/*
76
- mkdir -p $OMNIBUS_PACKAGE_DIR
@@ -10,7 +9,7 @@
109
- export VERSION_CACHE_CONTENT=$(cat agent-version.cache | base64 -)
1110
- python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat .dda/version)"
1211
- 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"
12+
- 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"
1413
- !reference [.upload_sbom_artifacts]
1514
timeout: 3h # MacOS builds can take 1h~2h, increase the timeout to avoid timeout flakes
1615
artifacts:

.gitlab/package_build/heroku.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
script:
1717
- !reference [.retrieve_linux_go_deps]
1818
- !reference [.cache_omnibus_ruby_deps, setup]
19-
- echo "About to build for $RELEASE_VERSION"
2019
# remove artifacts from previous pipelines that may come from the cache
2120
- rm -rf $OMNIBUS_PACKAGE_DIR/*
2221
# Artifacts and cache must live within project directory but we run omnibus in a neutral directory.
@@ -28,7 +27,7 @@
2827
- ${S3_CP_CMD} "${S3_PERMANENT_ARTIFACTS_URI}/llc-${CLANG_LLVM_VER}.${PACKAGE_ARCH}.${CLANG_BUILD_VERSION}" /tmp/system-probe/llc-bpf
2928
- cp $CI_PROJECT_DIR/minimized-btfs.tar.xz /tmp/system-probe/minimized-btfs.tar.xz
3029
- 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
30+
- 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
3231
- ls -la $OMNIBUS_PACKAGE_DIR
3332
- !reference [.create_signature_and_lint_linux_packages]
3433
- !reference [.upload_sbom_artifacts]

.gitlab/package_build/installer.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#
55
.common_build_oci:
66
script:
7-
- echo "About to build for $RELEASE_VERSION"
87
- AGENT_VERSION="$(dda inv agent.version -u)-1" || exit $?
98
- export INSTALL_DIR=/opt/datadog-packages/datadog-agent/"$AGENT_VERSION"
109
- !reference [.retrieve_linux_go_deps]
@@ -21,7 +20,7 @@
2120
- chmod 0744 /tmp/system-probe/clang-bpf /tmp/system-probe/llc-bpf
2221
# NOTE: for now, we consider "ociru" to be a "redhat_target" in omnibus/lib/ostools.rb
2322
# 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"
23+
- 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"
2524
- ls -la $OMNIBUS_PACKAGE_DIR
2625
- !reference [.upload_sbom_artifacts]
2726
variables:
@@ -140,12 +139,11 @@ powershell_script_signing:
140139
script:
141140
- !reference [.retrieve_linux_go_deps]
142141
- !reference [.cache_omnibus_ruby_deps, setup]
143-
- echo "About to build for $RELEASE_VERSION"
144142
# remove artifacts from previous pipelines that may come from the cache
145143
- rm -rf $OMNIBUS_PACKAGE_DIR/*
146144
# Artifacts and cache must live within project directory but we run omnibus in a neutral directory.
147145
# 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}
146+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project="installer" ${INSTALL_DIR_PARAM}
149147
- ls -la $OMNIBUS_PACKAGE_DIR
150148
- !reference [.upload_sbom_artifacts]
151149
variables:
@@ -233,7 +231,6 @@ windows-installer-amd64:
233231
-e CI_JOB_NAME_SLUG=${CI_JOB_NAME_SLUG}
234232
-e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
235233
-e WINDOWS_BUILDER=true
236-
-e RELEASE_VERSION="$RELEASE_VERSION"
237234
-e GOMODCACHE="c:\modcache"
238235
-e AWS_NETWORKING=true
239236
-e SIGN_WINDOWS_DD_WCS=true

.gitlab/package_build/linux.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.agent_build_script:
2-
- echo "About to build for $RELEASE_VERSION"
32
- !reference [.retrieve_linux_go_deps]
43
- !reference [.cache_omnibus_ruby_deps, setup]
54
# remove artifacts from previous pipelines that may come from the cache
@@ -12,7 +11,7 @@
1211
- ${S3_CP_CMD} "${S3_PERMANENT_ARTIFACTS_URI}/llc-${CLANG_LLVM_VER}.${PACKAGE_ARCH}.${CLANG_BUILD_VERSION}" /tmp/system-probe/llc-bpf
1312
- cp $CI_PROJECT_DIR/minimized-btfs.tar.xz /tmp/system-probe/minimized-btfs.tar.xz
1413
- 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"
14+
- 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"
1615
- ls -la $OMNIBUS_PACKAGE_DIR
1716
- !reference [.upload_sbom_artifacts]
1817

@@ -83,12 +82,11 @@ datadog-agent-7-arm64-fips:
8382
extends: .agent_build_common
8483
needs: ["go_mod_tidy_check", "go_deps"]
8584
script:
86-
- echo "About to build for $RELEASE_VERSION"
8785
- !reference [.retrieve_linux_go_deps]
8886
- !reference [.cache_omnibus_ruby_deps, setup]
8987
# remove artifacts from previous pipelines that may come from the cache
9088
- 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
89+
- 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
9290
- ls -la $OMNIBUS_PACKAGE_DIR
9391
- !reference [.upload_sbom_artifacts]
9492

@@ -126,12 +124,11 @@ iot-agent-armhf:
126124
- when: on_success
127125
stage: package_build
128126
script:
129-
- echo "About to build for $RELEASE_VERSION"
130127
- !reference [.retrieve_linux_go_deps]
131128
- !reference [.cache_omnibus_ruby_deps, setup]
132129
# remove artifacts from previous pipelines that may come from the cache
133130
- 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
131+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project dogstatsd
135132
- ls -la $OMNIBUS_PACKAGE_DIR
136133
- !reference [.upload_sbom_artifacts]
137134
variables:
@@ -168,12 +165,11 @@ dogstatsd-arm64:
168165
- when: on_success
169166
stage: package_build
170167
script:
171-
- echo "About to build for $RELEASE_VERSION"
172168
- !reference [.retrieve_linux_go_deps]
173169
- !reference [.cache_omnibus_ruby_deps, setup]
174170
# remove artifacts from previous pipelines that may come from the cache
175171
- 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
172+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project otel-agent
177173
- ls -la $OMNIBUS_PACKAGE_DIR
178174
- !reference [.upload_sbom_artifacts]
179175
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: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
stage: packaging
44
script:
55
- !reference [.cache_omnibus_ruby_deps, setup]
6-
- echo "About to package for $RELEASE_VERSION"
76
- !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}
7+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project ${DD_PROJECT} ${OMNIBUS_EXTRA_ARGS}
98
- !reference [.create_signature_and_lint_linux_packages]
109
artifacts:
1110
expire_in: 2 weeks
@@ -76,9 +75,8 @@ agent_deb-arm64-a7-fips:
7675
extends: [.package_deb_common]
7776
script:
7877
- !reference [.cache_omnibus_ruby_deps, setup]
79-
- echo "About to package for $RELEASE_VERSION"
8078
- !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}
79+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project ${DD_PROJECT} --flavor ot ${OMNIBUS_EXTRA_ARGS}
8280
- !reference [.create_signature_and_lint_linux_packages]
8381

8482
ot_agent_deb-x64-a7:
@@ -128,9 +126,8 @@ installer_deb-arm64:
128126
stage: packaging
129127
script:
130128
- !reference [.cache_omnibus_ruby_deps, setup]
131-
- echo "About to package for $RELEASE_VERSION"
132129
- !reference [.setup_deb_signing_key]
133-
- dda inv -- -e omnibus.build --release-version "$RELEASE_VERSION" --base-dir $OMNIBUS_BASE_DIR --skip-deps --flavor iot
130+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --flavor iot
134131
- !reference [.create_signature_and_lint_linux_packages]
135132
artifacts:
136133
expire_in: 2 weeks

.gitlab/packaging/rpm.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
- when: on_success
77
before_script:
88
script:
9-
- echo "About to build for $RELEASE_VERSION"
109
- !reference [.cache_omnibus_ruby_deps, setup]
1110
- printf -- "$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_GPG_KEY)" | gpg --import --batch
1211
- EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials needs gitlab runner restart"; exit $EXIT; fi
1312
- 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}
13+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project=${DD_PROJECT} ${OMNIBUS_EXTRA_ARGS}
1514
- ls -la $OMNIBUS_PACKAGE_DIR/
1615
- !reference [.create_signature_and_lint_linux_packages]
1716
stage: packaging
@@ -143,12 +142,11 @@ installer_suse_rpm-arm64:
143142
- !reference [.except_mergequeue]
144143
- when: on_success
145144
script:
146-
- echo "About to build for $RELEASE_VERSION"
147145
- !reference [.cache_omnibus_ruby_deps, setup]
148146
- printf -- "$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_GPG_KEY)" | gpg --import --batch
149147
- EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials needs gitlab runner restart"; exit $EXIT; fi
150148
- 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}
149+
- dda inv -- -e omnibus.build --base-dir $OMNIBUS_BASE_DIR --skip-deps --flavor=iot ${OMNIBUS_EXTRA_ARGS}
152150
- ls -la $OMNIBUS_PACKAGE_DIR/
153151
- !reference [.create_signature_and_lint_linux_packages]
154152
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 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: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
{
22
"base_branch": "main",
33
"current_milestone": "7.67.0",
4-
"last_stable": {
5-
"6": "6.53.1",
6-
"7": "7.64.3"
7-
},
8-
"nightly": {
4+
"dependencies":{
95
"OMNIBUS_RUBY_VERSION": "95630818722a63cb9e6f3163984f363d799633a1",
106
"JMXFETCH_VERSION": "0.49.6",
117
"JMXFETCH_HASH": "f06bdac1f8ec41daf9b9839ac883f1865a068b04810ea82197b8a6afb9369cb9",
@@ -19,48 +15,8 @@
1915
"WINDOWS_DDPROCMON_SHASUM": "e5525959521254ba8218f64f644ad19cdeb720aa48ee83eb5e402a8d1643e32e",
2016
"INTEGRATIONS_CORE_VERSION": "5cdecdf964f58b5809f71713ce3cb5681f6c7c2c"
2117
},
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.66.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-
},
36-
"dca-1.17.0": {
37-
"SECURITY_AGENT_POLICIES_VERSION": "v0.18.6"
38-
},
39-
"dca-1.16.0": {
40-
"SECURITY_AGENT_POLICIES_VERSION": "v0.17"
41-
},
42-
"dca-1.15.0": {
43-
"SECURITY_AGENT_POLICIES_VERSION": "v0.16"
44-
},
45-
"dca-1.14.0": {
46-
"SECURITY_AGENT_POLICIES_VERSION": "v0.15"
47-
},
48-
"dca-1.13.1": {
49-
"SECURITY_AGENT_POLICIES_VERSION": "v0.12"
50-
},
51-
"dca-1.13.0": {
52-
"SECURITY_AGENT_POLICIES_VERSION": "v0.10"
53-
},
54-
"dca-1.12.0": {
55-
"SECURITY_AGENT_POLICIES_VERSION": "v0.9"
56-
},
57-
"dca-1.10.0": {
58-
"SECURITY_AGENT_POLICIES_VERSION": "v0.5"
59-
},
60-
"dca-1.9.1": {
61-
"SECURITY_AGENT_POLICIES_VERSION": "v0.3"
62-
},
63-
"dca-1.9.0": {
64-
"SECURITY_AGENT_POLICIES_VERSION": "v0.3"
18+
"last_stable": {
19+
"6": "6.53.1",
20+
"7": "7.64.3"
6521
}
6622
}

0 commit comments

Comments
 (0)