From 9f0a356c66aa8075f29636c76d9ad898831e2fb8 Mon Sep 17 00:00:00 2001 From: Xavier Lamorlette Date: Wed, 11 Mar 2026 18:03:45 +0100 Subject: [PATCH 1/3] Remove wrong comments --- utils/scripts/load-binary.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/scripts/load-binary.sh b/utils/scripts/load-binary.sh index 9e1aded4bdc..92bf975f91d 100755 --- a/utils/scripts/load-binary.sh +++ b/utils/scripts/load-binary.sh @@ -12,7 +12,6 @@ # # * Agent: Docker hub datadog/agent-dev:master-py3 # * cpp_httpd: Github action artifact -# * cpp_nginx: From circle ci # * Golang: github.com/DataDog/dd-trace-go/v2@main # * .NET: ghcr.io/datadog/dd-trace-dotnet # * Java: S3 @@ -296,7 +295,6 @@ elif [ "$TARGET" = "haproxy" ]; then elif [ "$TARGET" = "cpp" ]; then assert_version_is_dev - # get_circleci_artifact "gh/DataDog/dd-opentracing-cpp" "build_test_deploy" "build" "TBD" # PROFILER: The main version is stored in s3, though we can not access this in CI # Not handled for now for system-tests. this handles artifact for parametric LIBRARY_TARGET_BRANCH="${LIBRARY_TARGET_BRANCH:-main}" From d7f1aa22bd5e91d5f6bb294ed7a367bd3beeb730 Mon Sep 17 00:00:00 2001 From: Xavier Lamorlette Date: Wed, 11 Mar 2026 18:04:56 +0100 Subject: [PATCH 2/3] Remove get_circleci_artifact() since we don't use anymore CircleCI --- utils/scripts/load-binary.sh | 73 ------------------------------------ 1 file changed, 73 deletions(-) diff --git a/utils/scripts/load-binary.sh b/utils/scripts/load-binary.sh index 92bf975f91d..cca143a3493 100755 --- a/utils/scripts/load-binary.sh +++ b/utils/scripts/load-binary.sh @@ -50,79 +50,6 @@ assert_target_branch_is_not_set() { exit 1 } -get_circleci_artifact() { - - SLUG=$1 - WORKFLOW_NAME=$2 - JOB_NAME=$3 - ARTIFACT_PATTERN=$4 - - echo "CircleCI: https://app.circleci.com/pipelines/$SLUG?branch=master" - PIPELINES=$(curl --silent https://circleci.com/api/v2/project/$SLUG/pipeline?branch=master -H "Circle-Token: $CIRCLECI_TOKEN") - - for i in {0..30}; do - PIPELINE_ID=$(echo $PIPELINES| jq -r ".items[$i].id") - PIPELINE_NUMBER=$(echo $PIPELINES | jq -r ".items[$i].number") - - echo "Trying pipeline #$i $PIPELINE_NUMBER/$PIPELINE_ID" - WORKFLOWS=$(curl --silent https://circleci.com/api/v2/pipeline/$PIPELINE_ID/workflow -H "Circle-Token: $CIRCLECI_TOKEN") - - QUERY=".items[] | select(.name == \"$WORKFLOW_NAME\") | .id" - WORKFLOW_IDS=$(echo $WORKFLOWS | jq -r "$QUERY") - - if [ ! -z "$WORKFLOW_IDS" ]; then - - for WORKFLOW_ID in $WORKFLOW_IDS; do - echo "=> https://app.circleci.com/pipelines/$SLUG/$PIPELINE_NUMBER/workflows/$WORKFLOW_ID" - - JOBS=$(curl --silent https://circleci.com/api/v2/workflow/$WORKFLOW_ID/job -H "Circle-Token: $CIRCLECI_TOKEN") - - QUERY=".items[] | select(.name == \"$JOB_NAME\" and .status==\"success\")" - JOB=$(echo $JOBS | jq "$QUERY") - - if [ ! -z "$JOB" ]; then - break - fi - done - - if [ ! -z "$JOB" ]; then - break - fi - fi - done - - if [ -z "$JOB" ]; then - echo "Oooops, I did not found any successful pipeline" - exit 1 - fi - - JOB_NUMBER=$(echo $JOB | jq -r ".job_number") - JOB_ID=$(echo $JOB | jq -r ".id") - - echo "Job number/ID: $JOB_NUMBER/$JOB_ID" - echo "Job URL: https://app.circleci.com/pipelines/$SLUG/$PIPELINE_NUMBER/workflows/$WORKFLOW_ID/jobs/$JOB_NUMBER" - - ARTIFACTS=$(curl --silent https://circleci.com/api/v2/project/$SLUG/$JOB_NUMBER/artifacts -H "Circle-Token: $CIRCLECI_TOKEN") - QUERY=".items[] | select(.path | test(\"$ARTIFACT_PATTERN\"))" - readarray -t ARTIFACT_URLS < <(jq -r "$QUERY | .url" <<< "$ARTIFACTS") - - if [[ ${#ARTIFACT_URLS[@]} -eq 0 ]]; then - echo "Oooops, I did not found any artifact that satisfy this pattern: $ARTIFACT_PATTERN. Here is the list:" - echo $ARTIFACTS | jq -r ".items[] | .path" - exit 1 - fi - echo "${ARTIFACT_URLS[@]}" - - local aurl= aname= - for aurl in "${ARTIFACT_URLS[@]}"; do - aname="${aurl##*/}" - echo "Artifact URL: $aurl" - echo "Artifact Name: $aname" - echo "Downloading artifact..." - curl --silent -L "$aurl" --output "$aname" - done -} - get_github_action_artifact() { rm -rf artifacts artifacts.zip From ad8a3765d75cc09753da1e1dc3ba3aca9c103e7f Mon Sep 17 00:00:00 2001 From: Xavier Lamorlette Date: Wed, 11 Mar 2026 18:12:02 +0100 Subject: [PATCH 3/3] Update Nginx version to latest, 1.29.6 --- utils/build/docker/cpp_nginx/nginx.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build/docker/cpp_nginx/nginx.Dockerfile b/utils/build/docker/cpp_nginx/nginx.Dockerfile index 3f23dd382d5..2adfe42a20c 100644 --- a/utils/build/docker/cpp_nginx/nginx.Dockerfile +++ b/utils/build/docker/cpp_nginx/nginx.Dockerfile @@ -1,6 +1,6 @@ FROM debian:bookworm-slim -ARG NGINX_VERSION="1.29.5" +ARG NGINX_VERSION="1.29.6" ENV NGINX_VERSION=${NGINX_VERSION} RUN groupadd --system --gid 101 nginx \