Skip to content

Commit 5b39e25

Browse files
committed
Update task to check the correct location
1 parent de50bdc commit 5b39e25

3 files changed

Lines changed: 8 additions & 10 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
require (
66
dario.cat/mergo v1.0.1
7-
github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd
7+
github.com/DataDog/datadog-agent/pkg/util/option v0.67.0
88
github.com/Masterminds/semver v1.5.0
99
github.com/alessio/shellescape v1.4.2
1010
github.com/aws/aws-sdk-go-v2 v1.32.7

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
22
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
33
github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
44
github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
5-
github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd h1:kam3LA9L/VuBRPQLqW4CBnelpxF1KY4WGbb/W2UHn2g=
6-
github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd/go.mod h1:BECd5pnMX9MEnARCAV+S7M0Sk/gYwopL7QlhCFdXSI0=
5+
github.com/DataDog/datadog-agent/pkg/util/option v0.67.0 h1:8WQBb4AOO7LGIbCnJsQZSP0xv/V9ELfe5pbgkOoak+Q=
6+
github.com/DataDog/datadog-agent/pkg/util/option v0.67.0/go.mod h1:BQJ+P1ycpK/T1DQvvPWle4ZkJ/QDLxg4pHzXnpfrUwY=
77
github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
88
github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
99
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=

tasks/deploy.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ def check_s3_image_exists(_, pipeline_id: str, deploy_job: str):
9191
# Job to s3 directory mapping
9292
deploy_job_to_s3 = {
9393
# Deb
94-
"deploy_deb_testing-a7_x64": f"apttesting.datad0g.com/dists/pipeline-{pipeline_id}-a7-x86_64/7/binary-x86_64",
95-
"deploy_deb_testing-a7_arm64": f"apttesting.datad0g.com/dists/pipeline-{pipeline_id}-a7-arm64/7/binary-arm64",
96-
"deploy_deb_testing-a6_x64": f"apttesting.datad0g.com/dists/pipeline-{pipeline_id}-a6-x86_64/6/binary-x86_64",
97-
"deploy_deb_testing-a6_arm64": f"apttesting.datad0g.com/dists/pipeline-{pipeline_id}-a6-arm64/6/binary-arm64",
94+
"deploy_deb_testing-a7_x64": f"apttesting.datad0g.com/datadog-agent/pipeline-{pipeline_id}-a7/dists/stable-x86_64/7/binary-amd64",
95+
"deploy_deb_testing-a7_arm64": f"apttesting.datad0g.com/datadog-agent/pipeline-{pipeline_id}-a7/dists/stable-arm64/7/binary-arm64",
96+
"deploy_deb_testing-a6_x64": f"apttesting.datad0g.com/datadog-agent/pipeline-{pipeline_id}-a6/dists/stable-x86_64/6/binary-amd64",
97+
"deploy_deb_testing-a6_arm64": f"apttesting.datad0g.com/datadog-agent/pipeline-{pipeline_id}-a6/dists/stable-arm64/6/binary-arm64",
9898
# Rpm
9999
"deploy_rpm_testing-a7_x64": f"yumtesting.datad0g.com/testing/pipeline-{pipeline_id}-a7/7/x86_64",
100100
"deploy_rpm_testing-a7_arm64": f"yumtesting.datad0g.com/testing/pipeline-{pipeline_id}-a7/7/aarch64",
@@ -119,9 +119,7 @@ def check_s3_image_exists(_, pipeline_id: str, deploy_job: str):
119119
response = s3.list_objects_v2(Bucket=bucket, Prefix=path)
120120
exists = "Contents" in response
121121

122-
assert exists, (
123-
f"Latest job {deploy_job} is outdated, use `inv retry-job {pipeline_id} {deploy_job}` to run it again or use --no-verify to force deploy"
124-
)
122+
assert exists, f"Latest job {deploy_job} is outdated, use `inv retry-job {pipeline_id} {deploy_job}` to run it again or use --no-verify to force deploy"
125123

126124

127125
# creates a stack with the given stack_name if it doesn't already exists

0 commit comments

Comments
 (0)