Skip to content

Commit 244332b

Browse files
committed
Properly use dda in all places
1 parent dd75660 commit 244332b

File tree

13 files changed

+20
-19
lines changed

13 files changed

+20
-19
lines changed

.gitlab/deploy_containers/deploy_containers_a7.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ include:
8484
stage: deploy_containers
8585
dependencies: []
8686
before_script:
87-
- if [[ "$VERSION" == "" ]]; then VERSION="$(inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)-fips" || exit $?; fi
87+
- if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)-fips" || exit $?; fi
8888
- export IMG_SOURCES="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-arm64"
8989
- export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${JMX}"
9090

@@ -93,7 +93,7 @@ include:
9393
stage: deploy_containers
9494
dependencies: []
9595
before_script:
96-
- if [[ "$VERSION" == "" ]]; then VERSION="$(inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
96+
- if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
9797
- export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
9898
- export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7-full-amd64,${IMG_BASE_SRC}-7-full-arm64"
9999
- export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7-jmx-win1809-amd64,${IMG_BASE_SRC}-7-jmx-winltsc2022-amd64"

.gitlab/deploy_dca/deploy_dca.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ deploy_containers-dca_internal-latest:
6262
- job: "docker_build_cluster_agent_fips_arm64"
6363
artifacts: false
6464
before_script:
65-
- if [[ "$VERSION" == "" ]]; then VERSION="$(inv agent.version --url-safe)" || exit $?; fi
65+
- if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe)" || exit $?; fi
6666
- if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent"; fi
6767
- export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
6868
- export IMG_SOURCES="${IMG_BASE_SRC}-fips-amd64,${IMG_BASE_SRC}-fips-arm64"

.gitlab/functional_test/static_quality_gate.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ static_quality_gates:
6565
- export DD_API_KEY="$DATADOG_API_KEY"
6666
- !reference [ .setup_agent_github_app ]
6767
- SLACK_DATADOG_AGENT_BOT_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $SLACK_AGENT token) || exit $?; export SLACK_DATADOG_AGENT_BOT_TOKEN
68-
- inv quality-gates.parse-and-trigger-gates
68+
- dda inv quality-gates.parse-and-trigger-gates

.gitlab/internal_image_deploy/internal_image_deploy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ docker_trigger_cluster_agent_internal-fips:
216216
TMPL_SRC_REPO="${TMPL_SRC_REPO}-nightly"
217217
fi
218218
- if [ "$BUCKET_BRANCH" = "dev" ]; then RELEASE_TAG="dev-${RELEASE_TAG}-${CI_COMMIT_SHORT_SHA}"; fi
219-
- "inv pipeline.trigger-child-pipeline --project-name DataDog/images --git-ref master --timeout 3600
219+
- "dda inv pipeline.trigger-child-pipeline --project-name DataDog/images --git-ref master --timeout 3600
220220
--variable IMAGE_VERSION
221221
--variable IMAGE_NAME
222222
--variable RELEASE_TAG
@@ -262,7 +262,7 @@ docker_trigger_internal-full:
262262
TMPL_SRC_REPO="${TMPL_SRC_REPO}-nightly"
263263
fi
264264
- if [ "$BUCKET_BRANCH" = "dev" ]; then RELEASE_TAG="dev-${RELEASE_TAG}-${CI_COMMIT_SHORT_SHA}"; fi
265-
- "inv pipeline.trigger-child-pipeline --project-name DataDog/images --git-ref master --timeout 3600
265+
- "dda inv pipeline.trigger-child-pipeline --project-name DataDog/images --git-ref master --timeout 3600
266266
--variable IMAGE_VERSION
267267
--variable IMAGE_NAME
268268
--variable RELEASE_TAG

.gitlab/package_build/linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ dogstatsd-arm64:
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-
- inv -e omnibus.build --release-version $RELEASE_VERSION --base-dir $OMNIBUS_BASE_DIR ${USE_S3_CACHING} --skip-deps --go-mod-cache="$GOPATH/pkg/mod" --target-project otel-agent
176+
- dda inv -e omnibus.build --release-version $RELEASE_VERSION --base-dir $OMNIBUS_BASE_DIR ${USE_S3_CACHING} --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:

pkg/gpu/testutil/event-viewer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ curl --unix-socket $DD_SYSPROBE_SOCKET http://unix/gpu/debug/collect-events?coun
1313
Build and use the event viewer:
1414
1515
```bash
16-
inv system-probe.build-gpu-event-viewer
16+
dda inv system-probe.build-gpu-event-viewer
1717
pkg/gpu/testutil/event-viewer/event-viewer path-to-events-file
1818
```

pkg/proto/datadog/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
## gRPC: Protobuf and Gateway code generation
22

3-
1. Ensure that you have the all the tools installed in your `$PATH` by running `inv -e install-tools`.
4-
2. To generate the code for the `.proto` files run `inv -e protobuf.generate`.
3+
1. Ensure that you have the all the tools installed in your `$PATH` by running `dda inv -e install-tools`.
4+
2. To generate the code for the `.proto` files run `dda inv -e protobuf.generate`.

tasks/buildimages.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ def update_test_infra_definitions(ctx: Context, commit_sha: str, go_mod_only: bo
5252
ctx.run("go mod tidy")
5353

5454
if not go_mod_only:
55-
prefix_comment = """# File generated by inv buildimages.update-test-infra-definitions
55+
prefix_comment = """# File generated by dda inv buildimages.update-test-infra-definitions
5656
# Please do not edit this file manually
57-
# To update the test-infra-definitions version, run `inv buildimages.update-test-infra-definitions --commit-sha <commit_sha>` [--is-dev-image]
57+
# To update the test-infra-definitions version, run `dda inv buildimages.update-test-infra-definitions --commit-sha <commit_sha>` [--is-dev-image]
5858
"""
5959
update_test_infra_def(
6060
file_path=".gitlab/common/test_infra_version.yml",

tasks/modules.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ def add_all_replace(ctx: Context):
331331
and no replace rule is missing.
332332
333333
It's meant to be used as the following:
334-
- running `inv modules.add-all-replace` to add all possible replace rules to all go.mod
335-
- `inv tidy` to update all the go.mod
334+
- running `dda inv modules.add-all-replace` to add all possible replace rules to all go.mod
335+
- `dda inv tidy` to update all the go.mod
336336
337337
This solves the problem of `go mod tidy` failing if some replace rules are missing but needing `go mod tidy` to run
338338
successfully to know which replace rules are needed. This is a major pain point when creating/moving go.mod.

tasks/protobuf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ def check_tools(ctx):
165165
"""
166166
tools = [tool.split("/")[-1] for tool in TOOL_LIST_PROTO]
167167
if not check_tools_installed(tools):
168-
raise Exit("Please install the required tools with `inv install-tools` before running this task.", code=1)
168+
raise Exit("Please install the required tools with `dda inv install-tools` before running this task.", code=1)
169169
try:
170170
current_version = ctx.run("protoc --version", hide=True).stdout.strip().removeprefix("libprotoc ")
171171
with open(".protoc-version") as f:
172172
expected_version = f.read().strip()
173173
if current_version != expected_version:
174174
raise Exit(
175-
f"Expected protoc version {expected_version}, found {current_version}. Please run `inv install-protoc` before running this task.",
175+
f"Expected protoc version {expected_version}, found {current_version}. Please run `dda inv install-protoc` before running this task.",
176176
code=1,
177177
)
178178
except UnexpectedExit as e:

tasks/release.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ def run_rc_pipeline(ctx, gitlab_tag, k8s_deployments=False):
644644
@task
645645
def alert_ci_on_call(ctx, release_branch):
646646
gitlab_tag = get_qualification_rc_tag(ctx, release_branch)
647-
message = f":loudspeaker: Agent 6 Update:\nThere is an ongoing Agent 6 release and since there are no new changes there will be no RC bump this week.\n\nPlease rerun the previous build pipeline:\ninv release.run-rc-pipeline --gitlab-tag {gitlab_tag}"
647+
message = f":loudspeaker: Agent 6 Update:\nThere is an ongoing Agent 6 release and since there are no new changes there will be no RC bump this week.\n\nPlease rerun the previous build pipeline:\ndda inv release.run-rc-pipeline --gitlab-tag {gitlab_tag}"
648648
post_message(ctx, "agent-ci-on-call", message)
649649

650650

tasks/unit_tests/libs/common/check_tools_tests.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ def test_tools_not_installed(self):
2525
with self.assertRaises(Exit) as e:
2626
check_tools(c)
2727
self.assertEqual(
28-
e.exception.message, "Please install the required tools with `inv install-tools` before running this task."
28+
e.exception.message,
29+
"Please install the required tools with `dda inv install-tools` before running this task.",
2930
)
3031

3132
@patch('tasks.protobuf.check_tools_installed', new=MagicMock(return_value=True))

tasks/winbuildscripts/Invoke-UnitTests.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Invoke-BuildScript `
119119
}
120120

121121
# Run python-script unit tests
122-
& inv -e invoke-unit-tests --directory=".\omnibus\python-scripts\"
122+
& dda inv -e invoke-unit-tests --directory=".\omnibus\python-scripts\"
123123
$err = $LASTEXITCODE
124124
Write-Host Python-script test result is $err
125125
if($err -ne 0){

0 commit comments

Comments
 (0)