fix(installer): Pull & build datadog-packages from Gitlab #27970
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BaptisteFoy
added
changelog/no-changelog
qa/no-code-change
Gitlab CI Configuration ChangesModified Jobs.deploy_packages_oci .deploy_packages_oci:
before_script:
- ls $OMNIBUS_PACKAGE_DIR
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/gitlab_agent_deploy$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
rules:
- if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
- if: $RUN_E2E_TESTS == "off"
when: never
- if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
when: never
- if: $RUN_E2E_TESTS == "on"
when: on_success
- if: $CI_COMMIT_BRANCH == "main"
when: on_success
- if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
when: on_success
- if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
when: on_success
- changes:
compare_to: main
paths:
- test/new-e2e/pkg/**/*
- test/new-e2e/go.mod
- changes:
compare_to: main
paths:
- .gitlab/**/*
- omnibus/config/**/*
- pkg/fleet/**/*
- cmd/installer/**/*
- test/new-e2e/tests/installer/**/*
- tasks/installer.py
when: on_success
- if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
when: never
- allow_failure: true
when: manual
script:
- python3 -m pip install -r tasks/libs/requirements-github.txt
- set +x
- - export GITHUB_KEY_B64=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh ci.datadog-agent.platform-github-app-key)
- - export GITHUB_APP_ID=682216
- - export GH_TOKEN=$(inv -e github.get-token-from-app --app-id-env=GITHUB_APP_ID
- --pkey-env=GITHUB_KEY_B64)
- export VERSION=$(inv agent.version --url-safe)-1
- - git config --global credential.helper '!f() { echo username=x-access-token; echo
- "password=$GH_TOKEN"; };f'
- - ${CI_PROJECT_DIR}/tools/ci/retry.sh git clone -v --depth=1 https:/DataDog/datadog-packages
- /tmp/datadog-packages
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf
"https:/DataDog/"
+ - go env -w GOPRIVATE="github.com/DataDog/*"
+ - export PATH=$PATH:$(go env GOPATH)/bin
+ - go install github.com/DataDog/datadog-packages/cmd/datadog-package@latest
- - export GOPROXY="binaries.ddbuild.io,proxy.golang.org,direct"
- - export GONOSUMDB="github.com/DataDog,go.ddbuild.io"
- - cd /tmp/datadog-packages/cmd/datadog-package
- - go build .
- - ./datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:${VERSION}
? --
+ - datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:${VERSION}
${OMNIBUS_PACKAGE_DIR}/${OCI_PRODUCT}-${VERSION}.oci.tar
- - ./datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID}
? --
+ - datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID}
${OMNIBUS_PACKAGE_DIR}/${OCI_PRODUCT}-${VERSION}.oci.tar
stage: deploy_packages
tags:
- arch:amd64
variables:
MAJOR_VERSION: 7.package_oci .package_oci:
artifacts:
paths:
- ${OMNIBUS_PACKAGE_DIR}
before_script:
- source /root/.bashrc
- export PACKAGE_VERSION=$(inv agent.version --url-safe --major-version 7)-1
- export INSTALL_DIR=/opt/datadog-packages/${OCI_PRODUCT}/${PACKAGE_VERSION}
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
rules:
- if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
when: never
- when: on_success
script:
- rm -f $OMNIBUS_PACKAGE_DIR/*-dbg-*.tar.xz
- ls -l $OMNIBUS_PACKAGE_DIR
- python3 -m pip install -r tasks/libs/requirements-github.txt
- - export GITHUB_KEY_B64=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh ci.datadog-agent.platform-github-app-key)
- - export GITHUB_APP_ID=682216
- set +x
- - export GH_TOKEN=$(inv -e github.get-token-from-app --app-id-env=GITHUB_APP_ID
- --pkey-env=GITHUB_KEY_B64)
- - git config --global credential.helper '!f() { echo username=x-access-token; echo
- "password=$GH_TOKEN"; };f'
- - cd /tmp/
- - ${CI_PROJECT_DIR}/tools/ci/retry.sh git clone --depth=1 https:/DataDog/datadog-packages
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf
"https:/DataDog/"
+ - go env -w GOPRIVATE="github.com/DataDog/*"
+ - ${CI_PROJECT_DIR}/tools/ci/retry.sh go install github.com/DataDog/datadog-packages/cmd/datadog-package@latest
- - export GOPROXY="binaries.ddbuild.io,proxy.golang.org,direct"
- - export GONOSUMDB="github.com/DataDog,go.ddbuild.io"
- - cd datadog-packages/cmd/datadog-package
- - ${CI_PROJECT_DIR}/tools/ci/retry.sh go build .
- OUTPUT_DIR="/tmp/oci_output"
- mkdir -p ${OUTPUT_DIR}
- ls $OMNIBUS_PACKAGE_DIR
- "if [ $(ls $OMNIBUS_PACKAGE_DIR/*.oci.tar 2> /dev/null | wc -l) -ge 1 ]; then\n\
\ echo \"Copying already built images to output dir\"\n cp $OMNIBUS_PACKAGE_DIR/*.oci.tar\
\ ${OUTPUT_DIR}\nfi\n"
- "for ARCH in \"amd64\" \"arm64\"; do\n INPUT_FILE=\"${OMNIBUS_PACKAGE_DIR}${OCI_PRODUCT}-*${ARCH}.tar.xz\"\
\n OUTPUT_FILE=\"$(basename -a -s .xz ${INPUT_FILE})\"\n MERGED_FILE=$(basename\
\ -a $OMNIBUS_PACKAGE_DIR/*.tar.xz | head -n 1 | sed \"s/-${ARCH}.tar.xz//\").oci.tar\n\
\ export MERGED_FILE\n INPUT_DIR=\"/tmp/input_${ARCH}\"\n mkdir -p ${INPUT_DIR}\n\
\ echo \"Generating OCI for $ARCH.\"\n echo \"Extracting to temporary input\
\ dir $INPUT_FILE -> $INPUT_DIR\"\n tar xJf ${INPUT_FILE} -C ${INPUT_DIR}\n \
\ echo \"Creating OCI layer -> ${OUTPUT_DIR}/${OUTPUT_FILE}\"\n if [ \"${OCI_PRODUCT}\"\
\ = \"datadog-agent\" ]; then\n EXTRA_FLAGS=\"--configs ${INPUT_DIR}/etc/datadog-agent\"\
- \n fi\n ./datadog-package create \\\n --version ${PACKAGE_VERSION} \\\n \
? --
+ \n fi\n datadog-package create \\\n --version ${PACKAGE_VERSION} \\\n \
? ++
- \ --package ${OCI_PRODUCT} \\\n --os linux \\\n --arch ${ARCH} \\\n \
? --
+ \ --package ${OCI_PRODUCT} \\\n --os linux \\\n --arch ${ARCH} \\\n --archive\
? +++++++++++
- \ --archive --archive-path \"${OUTPUT_DIR}/${OUTPUT_FILE}\" \\\n ${EXTRA_FLAGS}\
? -----------
+ \ --archive-path \"${OUTPUT_DIR}/${OUTPUT_FILE}\" \\\n ${EXTRA_FLAGS} \\\n\
? + ++++
- \ \\\n ${INPUT_DIR}/${INSTALL_DIR}/\n rm -f ${INPUT_FILE}\ndone\n"
? -----
+ \ ${INPUT_DIR}/${INSTALL_DIR}/\n rm -f ${INPUT_FILE}\ndone\n"
- echo "Aggregating all layers into one package -> ${MERGED_FILE}"
- ls -l ${OUTPUT_DIR}/
- - ./datadog-package merge ${OUTPUT_DIR}/*.tar
? --
+ - datadog-package merge ${OUTPUT_DIR}/*.tar
- cp merged.tar ${OMNIBUS_PACKAGE_DIR}/${MERGED_FILE}
- $S3_CP_CMD merged.tar $S3_ARTIFACTS_URI/${OCI_PRODUCT}_7_oci.tar
stage: packaging
tags:
- arch:amd64
variables:
KUBERNETES_CPU_REQUEST: 16
KUBERNETES_MEMORY_LIMIT: 32Gi
KUBERNETES_MEMORY_REQUEST: 32Giagent_oci agent_oci:
artifacts:
paths:
- ${OMNIBUS_PACKAGE_DIR}
before_script:
- source /root/.bashrc
- export PACKAGE_VERSION=$(inv agent.version --url-safe --major-version 7)-1
- export INSTALL_DIR=/opt/datadog-packages/${OCI_PRODUCT}/${PACKAGE_VERSION}
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
needs:
- datadog-agent-oci-x64-a7
- datadog-agent-oci-arm64-a7
- windows_msi_and_bosh_zip_x64-a7
rules:
- if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
when: never
- when: on_success
script:
- rm -f $OMNIBUS_PACKAGE_DIR/*-dbg-*.tar.xz
- ls -l $OMNIBUS_PACKAGE_DIR
- python3 -m pip install -r tasks/libs/requirements-github.txt
- - export GITHUB_KEY_B64=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh ci.datadog-agent.platform-github-app-key)
- - export GITHUB_APP_ID=682216
- set +x
- - export GH_TOKEN=$(inv -e github.get-token-from-app --app-id-env=GITHUB_APP_ID
- --pkey-env=GITHUB_KEY_B64)
- - git config --global credential.helper '!f() { echo username=x-access-token; echo
- "password=$GH_TOKEN"; };f'
- - cd /tmp/
- - ${CI_PROJECT_DIR}/tools/ci/retry.sh git clone --depth=1 https:/DataDog/datadog-packages
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf
"https:/DataDog/"
+ - go env -w GOPRIVATE="github.com/DataDog/*"
+ - ${CI_PROJECT_DIR}/tools/ci/retry.sh go install github.com/DataDog/datadog-packages/cmd/datadog-package@latest
- - export GOPROXY="binaries.ddbuild.io,proxy.golang.org,direct"
- - export GONOSUMDB="github.com/DataDog,go.ddbuild.io"
- - cd datadog-packages/cmd/datadog-package
- - ${CI_PROJECT_DIR}/tools/ci/retry.sh go build .
- OUTPUT_DIR="/tmp/oci_output"
- mkdir -p ${OUTPUT_DIR}
- ls $OMNIBUS_PACKAGE_DIR
- "if [ $(ls $OMNIBUS_PACKAGE_DIR/*.oci.tar 2> /dev/null | wc -l) -ge 1 ]; then\n\
\ echo \"Copying already built images to output dir\"\n cp $OMNIBUS_PACKAGE_DIR/*.oci.tar\
\ ${OUTPUT_DIR}\nfi\n"
- "for ARCH in \"amd64\" \"arm64\"; do\n INPUT_FILE=\"${OMNIBUS_PACKAGE_DIR}${OCI_PRODUCT}-*${ARCH}.tar.xz\"\
\n OUTPUT_FILE=\"$(basename -a -s .xz ${INPUT_FILE})\"\n MERGED_FILE=$(basename\
\ -a $OMNIBUS_PACKAGE_DIR/*.tar.xz | head -n 1 | sed \"s/-${ARCH}.tar.xz//\").oci.tar\n\
\ export MERGED_FILE\n INPUT_DIR=\"/tmp/input_${ARCH}\"\n mkdir -p ${INPUT_DIR}\n\
\ echo \"Generating OCI for $ARCH.\"\n echo \"Extracting to temporary input\
\ dir $INPUT_FILE -> $INPUT_DIR\"\n tar xJf ${INPUT_FILE} -C ${INPUT_DIR}\n \
\ echo \"Creating OCI layer -> ${OUTPUT_DIR}/${OUTPUT_FILE}\"\n if [ \"${OCI_PRODUCT}\"\
\ = \"datadog-agent\" ]; then\n EXTRA_FLAGS=\"--configs ${INPUT_DIR}/etc/datadog-agent\"\
- \n fi\n ./datadog-package create \\\n --version ${PACKAGE_VERSION} \\\n \
? --
+ \n fi\n datadog-package create \\\n --version ${PACKAGE_VERSION} \\\n \
? ++
- \ --package ${OCI_PRODUCT} \\\n --os linux \\\n --arch ${ARCH} \\\n \
? --
+ \ --package ${OCI_PRODUCT} \\\n --os linux \\\n --arch ${ARCH} \\\n --archive\
? +++++++++++
- \ --archive --archive-path \"${OUTPUT_DIR}/${OUTPUT_FILE}\" \\\n ${EXTRA_FLAGS}\
? -----------
+ \ --archive-path \"${OUTPUT_DIR}/${OUTPUT_FILE}\" \\\n ${EXTRA_FLAGS} \\\n\
? + ++++
- \ \\\n ${INPUT_DIR}/${INSTALL_DIR}/\n rm -f ${INPUT_FILE}\ndone\n"
? -----
+ \ ${INPUT_DIR}/${INSTALL_DIR}/\n rm -f ${INPUT_FILE}\ndone\n"
- echo "Aggregating all layers into one package -> ${MERGED_FILE}"
- ls -l ${OUTPUT_DIR}/
- - ./datadog-package merge ${OUTPUT_DIR}/*.tar
? --
+ - datadog-package merge ${OUTPUT_DIR}/*.tar
- cp merged.tar ${OMNIBUS_PACKAGE_DIR}/${MERGED_FILE}
- $S3_CP_CMD merged.tar $S3_ARTIFACTS_URI/${OCI_PRODUCT}_7_oci.tar
stage: packaging
tags:
- arch:amd64
variables:
KUBERNETES_CPU_REQUEST: 16
KUBERNETES_MEMORY_LIMIT: 32Gi
KUBERNETES_MEMORY_REQUEST: 32Gi
OCI_PRODUCT: datadog-agentdeploy_agent_oci deploy_agent_oci:
before_script:
- ls $OMNIBUS_PACKAGE_DIR
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/gitlab_agent_deploy$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
needs:
- agent_oci
rules:
- if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
- if: $RUN_E2E_TESTS == "off"
when: never
- if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
when: never
- if: $RUN_E2E_TESTS == "on"
when: on_success
- if: $CI_COMMIT_BRANCH == "main"
when: on_success
- if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
when: on_success
- if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
when: on_success
- changes:
compare_to: main
paths:
- test/new-e2e/pkg/**/*
- test/new-e2e/go.mod
- changes:
compare_to: main
paths:
- .gitlab/**/*
- omnibus/config/**/*
- pkg/fleet/**/*
- cmd/installer/**/*
- test/new-e2e/tests/installer/**/*
- tasks/installer.py
when: on_success
- if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
when: never
- allow_failure: true
when: manual
script:
- python3 -m pip install -r tasks/libs/requirements-github.txt
- set +x
- - export GITHUB_KEY_B64=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh ci.datadog-agent.platform-github-app-key)
- - export GITHUB_APP_ID=682216
- - export GH_TOKEN=$(inv -e github.get-token-from-app --app-id-env=GITHUB_APP_ID
- --pkey-env=GITHUB_KEY_B64)
- export VERSION=$(inv agent.version --url-safe)-1
- - git config --global credential.helper '!f() { echo username=x-access-token; echo
- "password=$GH_TOKEN"; };f'
- - ${CI_PROJECT_DIR}/tools/ci/retry.sh git clone -v --depth=1 https:/DataDog/datadog-packages
- /tmp/datadog-packages
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf
"https:/DataDog/"
+ - go env -w GOPRIVATE="github.com/DataDog/*"
+ - export PATH=$PATH:$(go env GOPATH)/bin
+ - go install github.com/DataDog/datadog-packages/cmd/datadog-package@latest
- - export GOPROXY="binaries.ddbuild.io,proxy.golang.org,direct"
- - export GONOSUMDB="github.com/DataDog,go.ddbuild.io"
- - cd /tmp/datadog-packages/cmd/datadog-package
- - go build .
- - ./datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:${VERSION}
? --
+ - datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:${VERSION}
${OMNIBUS_PACKAGE_DIR}/${OCI_PRODUCT}-${VERSION}.oci.tar
- - ./datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID}
? --
+ - datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID}
${OMNIBUS_PACKAGE_DIR}/${OCI_PRODUCT}-${VERSION}.oci.tar
stage: deploy_packages
tags:
- arch:amd64
variables:
MAJOR_VERSION: 7
OCI_PRODUCT: datadog-agentdeploy_installer_oci deploy_installer_oci:
before_script:
- ls $OMNIBUS_PACKAGE_DIR
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/gitlab_agent_deploy$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
needs:
- installer_oci
rules:
- if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
- if: $RUN_E2E_TESTS == "off"
when: never
- if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
when: never
- if: $RUN_E2E_TESTS == "on"
when: on_success
- if: $CI_COMMIT_BRANCH == "main"
when: on_success
- if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
when: on_success
- if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
when: on_success
- changes:
compare_to: main
paths:
- test/new-e2e/pkg/**/*
- test/new-e2e/go.mod
- changes:
compare_to: main
paths:
- .gitlab/**/*
- omnibus/config/**/*
- pkg/fleet/**/*
- cmd/installer/**/*
- test/new-e2e/tests/installer/**/*
- tasks/installer.py
when: on_success
- if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
when: never
- allow_failure: true
when: manual
script:
- python3 -m pip install -r tasks/libs/requirements-github.txt
- set +x
- - export GITHUB_KEY_B64=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh ci.datadog-agent.platform-github-app-key)
- - export GITHUB_APP_ID=682216
- - export GH_TOKEN=$(inv -e github.get-token-from-app --app-id-env=GITHUB_APP_ID
- --pkey-env=GITHUB_KEY_B64)
- export VERSION=$(inv agent.version --url-safe)-1
- - git config --global credential.helper '!f() { echo username=x-access-token; echo
- "password=$GH_TOKEN"; };f'
- - ${CI_PROJECT_DIR}/tools/ci/retry.sh git clone -v --depth=1 https:/DataDog/datadog-packages
- /tmp/datadog-packages
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf
"https:/DataDog/"
+ - go env -w GOPRIVATE="github.com/DataDog/*"
+ - export PATH=$PATH:$(go env GOPATH)/bin
+ - go install github.com/DataDog/datadog-packages/cmd/datadog-package@latest
- - export GOPROXY="binaries.ddbuild.io,proxy.golang.org,direct"
- - export GONOSUMDB="github.com/DataDog,go.ddbuild.io"
- - cd /tmp/datadog-packages/cmd/datadog-package
- - go build .
- - ./datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:${VERSION}
? --
+ - datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:${VERSION}
${OMNIBUS_PACKAGE_DIR}/${OCI_PRODUCT}-${VERSION}.oci.tar
- - ./datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID}
? --
+ - datadog-package push registry.ddbuild.io/ci/remote-updates/${OCI_PRODUCT}:pipeline-${CI_PIPELINE_ID}
${OMNIBUS_PACKAGE_DIR}/${OCI_PRODUCT}-${VERSION}.oci.tar
stage: deploy_packages
tags:
- arch:amd64
variables:
MAJOR_VERSION: 7
OCI_PRODUCT: datadog-installerinstaller_oci installer_oci:
artifacts:
paths:
- ${OMNIBUS_PACKAGE_DIR}
before_script:
- source /root/.bashrc
- export PACKAGE_VERSION=$(inv agent.version --url-safe --major-version 7)-1
- export INSTALL_DIR=/opt/datadog-packages/${OCI_PRODUCT}/${PACKAGE_VERSION}
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
needs:
- installer-arm64-oci
- installer-amd64-oci
rules:
- if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
when: never
- when: on_success
script:
- rm -f $OMNIBUS_PACKAGE_DIR/*-dbg-*.tar.xz
- ls -l $OMNIBUS_PACKAGE_DIR
- python3 -m pip install -r tasks/libs/requirements-github.txt
- - export GITHUB_KEY_B64=$($CI_PROJECT_DIR/tools/ci/aws_ssm_get_wrapper.sh ci.datadog-agent.platform-github-app-key)
- - export GITHUB_APP_ID=682216
- set +x
- - export GH_TOKEN=$(inv -e github.get-token-from-app --app-id-env=GITHUB_APP_ID
- --pkey-env=GITHUB_KEY_B64)
- - git config --global credential.helper '!f() { echo username=x-access-token; echo
- "password=$GH_TOKEN"; };f'
- - cd /tmp/
- - ${CI_PROJECT_DIR}/tools/ci/retry.sh git clone --depth=1 https:/DataDog/datadog-packages
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf
"https:/DataDog/"
+ - go env -w GOPRIVATE="github.com/DataDog/*"
+ - ${CI_PROJECT_DIR}/tools/ci/retry.sh go install github.com/DataDog/datadog-packages/cmd/datadog-package@latest
- - export GOPROXY="binaries.ddbuild.io,proxy.golang.org,direct"
- - export GONOSUMDB="github.com/DataDog,go.ddbuild.io"
- - cd datadog-packages/cmd/datadog-package
- - ${CI_PROJECT_DIR}/tools/ci/retry.sh go build .
- OUTPUT_DIR="/tmp/oci_output"
- mkdir -p ${OUTPUT_DIR}
- ls $OMNIBUS_PACKAGE_DIR
- "if [ $(ls $OMNIBUS_PACKAGE_DIR/*.oci.tar 2> /dev/null | wc -l) -ge 1 ]; then\n\
\ echo \"Copying already built images to output dir\"\n cp $OMNIBUS_PACKAGE_DIR/*.oci.tar\
\ ${OUTPUT_DIR}\nfi\n"
- "for ARCH in \"amd64\" \"arm64\"; do\n INPUT_FILE=\"${OMNIBUS_PACKAGE_DIR}${OCI_PRODUCT}-*${ARCH}.tar.xz\"\
\n OUTPUT_FILE=\"$(basename -a -s .xz ${INPUT_FILE})\"\n MERGED_FILE=$(basename\
\ -a $OMNIBUS_PACKAGE_DIR/*.tar.xz | head -n 1 | sed \"s/-${ARCH}.tar.xz//\").oci.tar\n\
\ export MERGED_FILE\n INPUT_DIR=\"/tmp/input_${ARCH}\"\n mkdir -p ${INPUT_DIR}\n\
\ echo \"Generating OCI for $ARCH.\"\n echo \"Extracting to temporary input\
\ dir $INPUT_FILE -> $INPUT_DIR\"\n tar xJf ${INPUT_FILE} -C ${INPUT_DIR}\n \
\ echo \"Creating OCI layer -> ${OUTPUT_DIR}/${OUTPUT_FILE}\"\n if [ \"${OCI_PRODUCT}\"\
\ = \"datadog-agent\" ]; then\n EXTRA_FLAGS=\"--configs ${INPUT_DIR}/etc/datadog-agent\"\
- \n fi\n ./datadog-package create \\\n --version ${PACKAGE_VERSION} \\\n \
? --
+ \n fi\n datadog-package create \\\n --version ${PACKAGE_VERSION} \\\n \
? ++
- \ --package ${OCI_PRODUCT} \\\n --os linux \\\n --arch ${ARCH} \\\n \
? --
+ \ --package ${OCI_PRODUCT} \\\n --os linux \\\n --arch ${ARCH} \\\n --archive\
? +++++++++++
- \ --archive --archive-path \"${OUTPUT_DIR}/${OUTPUT_FILE}\" \\\n ${EXTRA_FLAGS}\
? -----------
+ \ --archive-path \"${OUTPUT_DIR}/${OUTPUT_FILE}\" \\\n ${EXTRA_FLAGS} \\\n\
? + ++++
- \ \\\n ${INPUT_DIR}/${INSTALL_DIR}/\n rm -f ${INPUT_FILE}\ndone\n"
? -----
+ \ ${INPUT_DIR}/${INSTALL_DIR}/\n rm -f ${INPUT_FILE}\ndone\n"
- echo "Aggregating all layers into one package -> ${MERGED_FILE}"
- ls -l ${OUTPUT_DIR}/
- - ./datadog-package merge ${OUTPUT_DIR}/*.tar
? --
+ - datadog-package merge ${OUTPUT_DIR}/*.tar
- cp merged.tar ${OMNIBUS_PACKAGE_DIR}/${MERGED_FILE}
- $S3_CP_CMD merged.tar $S3_ARTIFACTS_URI/${OCI_PRODUCT}_7_oci.tar
stage: packaging
tags:
- arch:amd64
variables:
KUBERNETES_CPU_REQUEST: 16
KUBERNETES_MEMORY_LIMIT: 32Gi
KUBERNETES_MEMORY_REQUEST: 32Gi
OCI_PRODUCT: datadog-installerChanges Summary
|
|
[Fast Unit Tests Report] On pipeline 40449893 (CI Visibility). The following jobs did not run any unit tests: Jobs:
If you modified Go files and expected unit tests to run in these jobs, please double check the job logs. If you think tests should have been executed reach out to #agent-devx-help |
Regression DetectorRegression Detector ResultsRun ID: d7b6045b-3840-4ad8-8153-138871a16e0d Metrics dashboard Target profiles Baseline: 6899e33 Performance changes are noted in the perf column of each table:
No significant changes in experiment optimization goalsConfidence level: 90.00% There were no significant changes in experiment optimization goals at this confidence level and effect size tolerance.
|
| perf | experiment | goal | Δ mean % | Δ mean % CI | links |
|---|---|---|---|---|---|
| ➖ | tcp_syslog_to_blackhole | ingress throughput | +6.95 | [-6.65, +20.55] | Logs |
| ➖ | pycheck_1000_100byte_tags | % cpu utilization | +3.41 | [-1.30, +8.11] | Logs |
| ➖ | uds_dogstatsd_to_api_cpu | % cpu utilization | +1.29 | [+0.41, +2.17] | Logs |
| ➖ | otel_to_otel_logs | ingress throughput | +0.40 | [-0.41, +1.21] | Logs |
| ➖ | file_tree | memory utilization | +0.07 | [-0.00, +0.15] | Logs |
| ➖ | idle | memory utilization | +0.04 | [+0.01, +0.08] | Logs |
| ➖ | tcp_dd_logs_filter_exclude | ingress throughput | +0.00 | [-0.01, +0.01] | Logs |
| ➖ | uds_dogstatsd_to_api | ingress throughput | -0.00 | [-0.00, +0.00] | Logs |
| ➖ | basic_py_check | % cpu utilization | -0.45 | [-3.11, +2.20] | Logs |
Explanation
A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".
For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:
-
Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.
-
Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.
-
Its configuration does not mark it "erratic".
BaptisteFoy
force-pushed
the
baptiste.foy/FA/GOPRIVATE
branch
from
d9c2eb7
to
63b7d96
Compare
BaptisteFoy
force-pushed
the
baptiste.foy/FA/GOPRIVATE
branch
from
63b7d96
to
3d4b332
Compare
BaptisteFoy
force-pushed
the
baptiste.foy/FA/GOPRIVATE
branch
2 times, most recently
from
1d563b2
to
61f620a
Compare
BaptisteFoy
changed the title
BaptisteFoy
force-pushed
the
baptiste.foy/FA/GOPRIVATE
branch
from
61f620a
to
4aa1f5d
Compare
BaptisteFoy
force-pushed
the
baptiste.foy/FA/GOPRIVATE
branch
from
4aa1f5d
to
577b541
Compare
chouquette
reviewed
Jul 30, 2024
chouquette
approved these changes
Jul 30, 2024
…g-agent into baptiste.foy/FA/GOPRIVATE
|
/merge |
|
🚂 MergeQueue: pull request added to the queue The median merge time in Use |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.56.x 7.56.x
# Navigate to the new working tree
cd .worktrees/backport-7.56.x
# Create a new branch
git switch --create backport-27970-to-7.56.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4fb043abc7ef478874e4a464748da433b766cc40
# Push it to GitHub
git push --set-upstream origin backport-27970-to-7.56.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.56.xThen, create a pull request where the |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.55.x 7.55.x
# Navigate to the new working tree
cd .worktrees/backport-7.55.x
# Create a new branch
git switch --create backport-27970-to-7.55.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4fb043abc7ef478874e4a464748da433b766cc40
# Push it to GitHub
git push --set-upstream origin backport-27970-to-7.55.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.55.xThen, create a pull request where the |
chouquette
pushed a commit
that referenced
this pull request
Aug 1, 2024
(cherry picked from commit 4fb043a)
chouquette
pushed a commit
that referenced
this pull request
Aug 1, 2024
(cherry picked from commit 4fb043a)
dd-mergequeue bot
pushed a commit
that referenced
this pull request
Aug 1, 2024
…28117) Co-authored-by: BaptisteFoy <[email protected]>
dd-mergequeue bot
pushed a commit
that referenced
this pull request
Aug 1, 2024
…28116) Co-authored-by: BaptisteFoy <[email protected]>
This was referenced Aug 29, 2024
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Today we rely on Github to pull & build datadog-packages. This has some inconvenients such as secret token management, rate limiting, & difficulties to pull private registries. This PR fixes it by relying on Gitlab where auth between repos is already managed.
Motivation
datadog-packages build reliability
Additional Notes
Possible Drawbacks / Trade-offs
Describe how to test/QA your changes