Skip to content

Commit

Permalink
Merge branch 'main' of ssh://github.com/DataDog/datadog-agent into le…
Browse files Browse the repository at this point in the history
…naic/containerimage
  • Loading branch information
L3n41c committed Jan 10, 2023
2 parents a3a6259 + 077ab21 commit dcbf036
Show file tree
Hide file tree
Showing 1,194 changed files with 116,130 additions and 63,093 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ experimental:
templates:
job_template: &job_template
docker:
- image: datadog/datadog-agent-runner-circle:go1188
- image: datadog/datadog-agent-runner-circle:go1189
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down
2 changes: 1 addition & 1 deletion .circleci/images/runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN set -ex \
xz-utils

# Golang
ENV GIMME_GO_VERSION 1.18.8
ENV GIMME_GO_VERSION 1.18.9
ENV GOROOT /root/.gimme/versions/go$GIMME_GO_VERSION.linux.amd64
ENV GOPATH /go
ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH
Expand Down
1 change: 1 addition & 0 deletions .copyright-overrides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,4 @@ gomodules.xyz/jsonpatch: Copyright (c) 2015 The Authors
github.com/bytecodealliance/wasmtime-go: Copyright (c) 2020 The Bytecode Alliance
github.com/OneOfOne/xxhash: Copyright (c) 2014 Ahmed W. (OneOfOne)
github.com/yashtewari/glob-intersection: Copyright (c) 2018 Yash Tewari (yashtewari)
go.mongodb.org/mongo-driver/*: Copyright © 2018 MongoDB, Inc.
16 changes: 12 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@
/.gitlab/choco_build.yml @DataDog/agent-platform @DataDog/windows-agent
/.gitlab/choco_deploy.yml @DataDog/agent-platform @DataDog/windows-agent

/.gitlab/benchmarks/benchmarks.yml @DataDog/agent-apm

/chocolatey/ @DataDog/windows-agent

/cmd/ @DataDog/agent-shared-components
Expand Down Expand Up @@ -218,10 +220,10 @@
/pkg/collector/corechecks/embed/process_agent*.go @Datadog/agent-platform @DataDog/processes
/pkg/collector/corechecks/net/ @DataDog/agent-platform
/pkg/collector/corechecks/snmp/ @DataDog/network-device-monitoring
/pkg/collector/corechecks/system/ @DataDog/agent-platform
/pkg/collector/corechecks/system/*windows*.go @DataDog/agent-platform @DataDog/windows-agent
/pkg/collector/corechecks/system/winkmem/ @DataDog/windows-agent
/pkg/collector/corechecks/system/winproc/ @DataDog/windows-agent
/pkg/collector/corechecks/system/ @DataDog/agent-platform
/pkg/collector/corechecks/system/**/*_windows*.go @DataDog/agent-platform @DataDog/windows-agent
/pkg/collector/corechecks/system/winkmem/ @DataDog/windows-agent
/pkg/collector/corechecks/system/winproc/ @DataDog/windows-agent
/pkg/collector/corechecks/systemd/ @DataDog/agent-integrations
/pkg/collector/corechecks/nvidia/ @DataDog/agent-platform
/pkg/config/ @DataDog/agent-shared-components
Expand Down Expand Up @@ -274,14 +276,18 @@
/pkg/proto/pbgo/ # do not notify anyone
/pkg/orchestrator/ @DataDog/container-app
/pkg/network/ @DataDog/Networks
/pkg/network/*usm* @DataDog/universal-service-monitoring
/pkg/network/*_windows*.go @DataDog/windows-kernel-integrations
/pkg/network/driver_*.go @DataDog/windows-kernel-integrations
/pkg/network/dns/*_windows*.go @DataDog/windows-kernel-integrations
/pkg/network/driver/ @DataDog/windows-kernel-integrations
/pkg/network/ebpf/c/prebuilt/usm* @DataDog/universal-service-monitoring
/pkg/network/ebpf/c/runtime/usm* @DataDog/universal-service-monitoring
/pkg/network/ebpf/c/prebuilt/http* @DataDog/universal-service-monitoring
/pkg/network/ebpf/c/runtime/http* @DataDog/universal-service-monitoring
/pkg/network/ebpf/c/protocols/ @DataDog/universal-service-monitoring
/pkg/network/encoding/http* @DataDog/universal-service-monitoring
/pkg/network/encoding/*usm* @DataDog/universal-service-monitoring
/pkg/network/etw/ @DataDog/windows-kernel-integrations
/pkg/network/go/ @DataDog/universal-service-monitoring
/pkg/network/protocols/ @DataDog/universal-service-monitoring
Expand Down Expand Up @@ -351,8 +357,10 @@
/test/kitchen/test/integration/win-reinstall-option/ @DataDog/windows-agent
/test/kitchen/test/integration/win-repair/ @DataDog/windows-agent
/test/kitchen/test/integration/win-user/ @DataDog/windows-agent
/test/new-e2e/ @DataDog/agent-e2e-testing
/test/system/ @DataDog/agent-shared-components
/test/system/dogstatsd/ @DataDog/agent-metrics-logs
/test/benchmarks/apm_scripts/ @DataDog/agent-apm

/tools/ @DataDog/agent-platform
/tools/ebpf/ @DataDog/ebpf-platform
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/do-not-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Fails a pull request if a label contains `do-not-merge`
# credit: https://github.com/jessesquires/gh-workflows/blob/main/.github/workflows/do-not-merge.yml

name: Do Not Merge

on:
pull_request:
types: [synchronize, opened, reopened, labeled, unlabeled]

jobs:
do-not-merge:
if: ${{ contains(github.event.*.labels.*.name, 'do-not-merge/hold') || contains(github.event.*.labels.*.name, 'do-not-merge/WIP') }}
name: Check Do Not Merge
runs-on: ubuntu-latest
steps:
- name: check for label
run: |
echo "Pull request is labeled as 'do-not-merge'"
echo "This workflow fails so that the pull request cannot be merged"
exit 1
13 changes: 9 additions & 4 deletions .github/workflows/serverless-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 14

- name: Install Serverless Framework
run: sudo yarn global add serverless@^3.7.9 --prefix /usr/local

Expand All @@ -45,8 +45,13 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Run tests if AWS credentials are available
uses: nick-fields/retry@v2
env:
AWS_ACCESS_KEY_ID: ${{ secrets.SERVERLESS_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SERVERLESS_AWS_SECRET_ACCESS_KEY }}
run: ARCHITECTURE=${{ matrix.architecture }} ./test/integration/serverless/run.sh
working-directory: go/src/github.com/DataDog/datadog-agent
AWS_SECRET_ACCESS_KEY: ${{ secrets.SERVERLESS_AWS_SECRET_ACCESS_KEY }}
with:
timeout_minutes: 30
max_attempts: 2
command: |
cd go/src/github.com/DataDog/datadog-agent
ARCHITECTURE=${{ matrix.architecture }} ./test/integration/serverless/run.sh
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ system-probe-msg.h
**/.ninja_deps
*.ninja
pkg/ebpf/bytecode/build/**/*.d
pkg/ebpf/bytecode/runtime/conntrack.go
pkg/ebpf/bytecode/runtime/http.go
pkg/ebpf/bytecode/runtime/oom-kill.go
pkg/ebpf/bytecode/runtime/runtime-security.go
pkg/ebpf/bytecode/runtime/tcp-queue-length.go
pkg/ebpf/bytecode/runtime/tracer.go
pkg/security/tests/syscall_tester/**/*.d

# dsd artifacts
Expand Down Expand Up @@ -176,3 +182,6 @@ TAGS

# cscope
cscope.out

# Go workspace until we have proper support in the tooling
go.work*
25 changes: 19 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ include:
- /.gitlab/kitchen_common/cleanup.yml
- /.gitlab/kitchen_common/testing.yml
- /.gitlab/docker_common/publish_job_templates.yml
- /.gitlab/benchmarks/benchmarks.yml

default:
retry:
Expand All @@ -61,6 +62,7 @@ stages:
- binary_build
- package_deps_build
- integration_test
- benchmarks
- package_build
- internal_deploy
- kitchen_deploy
Expand Down Expand Up @@ -135,17 +137,18 @@ variables:
## comment out the line below to disable integration wheels cache
INTEGRATION_WHEELS_CACHE_BUCKET: dd-agent-omnibus
S3_DD_AGENT_OMNIBUS_LLVM_URI: s3://dd-agent-omnibus/llvm
S3_DD_AGENT_OMNIBUS_BTFS_URI: s3://dd-agent-omnibus/btfs
GENERAL_ARTIFACTS_CACHE_BUCKET_URL: https://dd-agent-omnibus.s3.amazonaws.com
S3_DSD6_URI: s3://dsd6-staging
RELEASE_VERSION_6: nightly
RELEASE_VERSION_7: nightly-a7
DATADOG_AGENT_BUILDIMAGES: v10863649-c23f296
DATADOG_AGENT_BUILDIMAGES: v12145148-530d89c
DATADOG_AGENT_BUILDERS: v9930706-ef9d493
DATADOG_AGENT_WINBUILDIMAGES: v10863649-c23f296
DATADOG_AGENT_ARMBUILDIMAGES: v10863649-c23f296
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v10863649-c23f296
DATADOG_AGENT_NIKOS_BUILDIMAGES: v10863649-c23f296
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v10582792-c2b9fb7
DATADOG_AGENT_WINBUILDIMAGES: v11651098-faf0544
DATADOG_AGENT_ARMBUILDIMAGES: v11651098-faf0544
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v11651098-faf0544
DATADOG_AGENT_NIKOS_BUILDIMAGES: v11651098-faf0544
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v11463399-6ff70af
DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
NIKOS_INSTALL_DIR: /opt/datadog-agent/embedded/nikos
NIKOS_EMBEDDED_PATH: /opt/datadog-agent/embedded/nikos/embedded
Expand All @@ -166,7 +169,9 @@ variables:
ARTIFACTORY_TOKEN_SSM_NAME: ci.datadog-agent.artifactory_token
ARTIFACTORY_URL: datadog.jfrog.io
ARTIFACTORY_GEMS_PATH: artifactory/api/gems/agent-gems
ARTIFACTORY_PYPI_PATH: artifactory/api/pypi/agent-pypi/simple
USE_CACHING_PROXY_RUBY: "true"
USE_CACHING_PROXY_PYTHON: "true"
CLANG_LLVM_VER: 12.0.1

#
Expand Down Expand Up @@ -766,3 +771,11 @@ variables:
- <<: *if_kitchen
when: manual
allow_failure: true

.on_trace_agent_changes_or_manual:
- changes:
- pkg/trace/**/*
- .gitlab/benchmarks/*
when: on_success
- when: manual
allow_failure: true
1 change: 1 addition & 0 deletions .gitlab/JOBOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ deploy_containers* @DataDog/container-integrations
kitchen_*_system_probe* @DataDog/ebpf-platform
kitchen_*_security_agent* @DataDog/agent-security
kitchen_*_process_agent* @DataDog/processes
pull_test_dockers @DataDog/universal-service-monitoring
cleanup_kitchen_functional_test @DataDog/ebpf-platform @DataDog/agent-security
serverless_cold_start_performance-deb_x64 @DataDog/serverless

Expand Down
24 changes: 24 additions & 0 deletions .gitlab/benchmarks/benchmarks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
benchmark:
stage: benchmarks
# This base image is created here: https://gitlab.ddbuild.io/DataDog/apm-reliability/relenv-microbenchmarking-platform
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/relenv-microbenchmarking-platform:trace-agent
timeout: 1h
rules:
!reference [.on_trace_agent_changes_or_manual]
interruptible: true
# tags: ["runner:apm-k8s-tweaked-metal"] # TODO: Commented out until we have the metal runners available in this repo
tags: ["runner:main"]
script:
- ./test/benchmarks/apm_scripts/capture-hardware-software-info.sh
- ./test/benchmarks/apm_scripts/run-benchmarks.sh
# - ./test/benchmarks/apm_scripts/upload-results-to-s3.sh #commented out until we have merged our permissions changes
- ./test/benchmarks/apm_scripts/analyze-results.sh
- ./test/benchmarks/apm_scripts/post-pr-comment.sh
artifacts:
name: "reports"
paths:
- reports/
expire_in: 3 months
variables:
KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: datadog-agent
FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
11 changes: 10 additions & 1 deletion .gitlab/binary_build/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@ build_windows_container_entrypoint:
- $ErrorActionPreference = "Stop"
- '$_instance_id = (iwr -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content ; Write-Host "Running on instance $($_instance_id)"'
- if (Test-Path build-out) { remove-item -recurse -force build-out }
- docker run --rm -m 4096M -v "$(Get-Location):c:\mnt" -e CI_JOB_ID=${CI_JOB_ID} -e WINDOWS_BUILDER=true -e AWS_NETWORKING=true -e TARGET_ARCH="$ARCH" 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_1809_${ARCH}:${Env:DATADOG_AGENT_WINBUILDIMAGES} c:\mnt\Dockerfiles\agent\windows\entrypoint\build.bat
- >
docker run --rm
-m 4096M
-v "$(Get-Location):c:\mnt"
-e CI_JOB_ID=${CI_JOB_ID}
-e WINDOWS_BUILDER=true
-e AWS_NETWORKING=true
-e TARGET_ARCH="$ARCH"
486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_1809_${ARCH}:${Env:DATADOG_AGENT_WINBUILDIMAGES}
c:\mnt\Dockerfiles\agent\windows\entrypoint\build.bat
- If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
- get-childitem build-out\${CI_JOB_ID}
- copy build-out\${CI_JOB_ID}\*.exe ./entrypoint.exe
Expand Down
7 changes: 6 additions & 1 deletion .gitlab/choco_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,10 @@ publish_choco_7_x64:
- mkdir nupkg
- copy omnibus\pkg\*.nupkg nupkg\
- Get-ChildItem nupkg
- docker run --rm -v "$(Get-Location):c:\mnt" -e CHOCOLATEY_API_KEY=${chocolateyApiKey} 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_1809_${ARCH}:$Env:DATADOG_AGENT_WINBUILDIMAGES c:\mnt\tasks\winbuildscripts\chocopush.bat
- >
docker run --rm
-v "$(Get-Location):c:\mnt"
-e CHOCOLATEY_API_KEY=${chocolateyApiKey}
486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_1809_${ARCH}:$Env:DATADOG_AGENT_WINBUILDIMAGES
c:\mnt\tasks\winbuildscripts\chocopush.bat
- If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
10 changes: 9 additions & 1 deletion .gitlab/container_build/docker_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,15 @@
- get-childitem ${BUILD_CONTEXT}
# Docker setup
- cat ci-scripts/docker-login.ps1
- docker run --rm -w C:\mnt -e AWS_NETWORKING=true -e SIGN_WINDOWS=true -v "$(Get-Location):C:\mnt" -v \\.\pipe\docker_engine:\\.\pipe\docker_engine 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_${Env:VARIANT}_x64:${Env:DATADOG_AGENT_WINBUILDIMAGES} powershell -C C:\mnt\ci-scripts\docker-login.ps1
- >
docker run --rm
-w C:\mnt
-e AWS_NETWORKING=true
-e SIGN_WINDOWS=true
-v "$(Get-Location):C:\mnt"
-v \\.\pipe\docker_engine:\\.\pipe\docker_engine 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_${Env:VARIANT}_x64:${Env:DATADOG_AGENT_WINBUILDIMAGES}
powershell
-C C:\mnt\ci-scripts\docker-login.ps1
- If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
- powershell -Command "docker build --no-cache --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL} ${BUILD_ARG} --pull --file ${BUILD_CONTEXT}/windows/amd64/Dockerfile --tag ${TARGET_TAG} ${BUILD_CONTEXT}"
- If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
Expand Down
1 change: 0 additions & 1 deletion .gitlab/deploy_7/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ deploy_packages_suse_rpm-7:
- $S3_CP_CMD --recursive --exclude "*" --include "*-7.*x86_64.rpm" $OMNIBUS_PACKAGE_DIR_SUSE $S3_RELEASE_ARTIFACTS_URI/suse_rpm/x86_64/ || true

deploy_packages_dmg-a7:
allow_failure: true
rules:
!reference [.on_deploy_a7]
stage: deploy7
Expand Down
9 changes: 8 additions & 1 deletion .gitlab/deploy_7/winget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,12 @@ publish_winget_7_x64:
script:
- '$_instance_id = (iwr -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content ; Write-Host "Running on instance $($_instance_id)"'
- $ErrorActionPreference = "Stop"
- docker run --rm -v "$(Get-Location):c:\mnt" -e WINGET_GITHUB_ACCESS_TOKEN=${wingetPat} -e GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL} 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_1809_${ARCH}:$Env:DATADOG_AGENT_WINBUILDIMAGES Powershell -C "C:\mnt\tasks\winbuildscripts\Update-Winget.ps1"
- >
docker run --rm
-v "$(Get-Location):c:\mnt"
-e WINGET_GITHUB_ACCESS_TOKEN=${wingetPat}
-e GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_1809_${ARCH}:$Env:DATADOG_AGENT_WINBUILDIMAGES
Powershell
-C "C:\mnt\tasks\winbuildscripts\Update-Winget.ps1"
- If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
20 changes: 14 additions & 6 deletions .gitlab/deps_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,13 @@ build_vcpkg_deps:
- $ErrorActionPreference = "Stop"
- '$_instance_id = (iwr -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content ; Write-Host "Running on instance $($_instance_id)"'
- if (Test-Path build-out) { remove-item -recurse -force build-out }
- docker run --rm -m 4096M -v "$(Get-Location):c:\mnt" -e VCPKG_BINARY_SOURCES="clear;x-azblob,${vcpkgBlobSaSUrl},readwrite" 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_1809_${ARCH}:${Env:DATADOG_AGENT_WINBUILDIMAGES} C:\mnt\tasks\winbuildscripts\build_vcpkg_deps.bat
- >
docker run --rm
-m 4096M
-v "$(Get-Location):c:\mnt"
-e VCPKG_BINARY_SOURCES="clear;x-azblob,${vcpkgBlobSaSUrl},readwrite"
486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/windows_1809_${ARCH}:${Env:DATADOG_AGENT_WINBUILDIMAGES}
C:\mnt\tasks\winbuildscripts\build_vcpkg_deps.bat
- If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }

build_processed_btfhub_archive:
Expand All @@ -138,16 +144,16 @@ build_processed_btfhub_archive:
- git clone https://github.com/aquasecurity/btfhub-archive.git
- cd btfhub-archive
# Flatten btfhub-archive directories & separate arm/x64 btfs into separate directories
- dirs=("amzn/2" "centos/7" "centos/8" "debian/9" "debian/10" "fedora/29" "fedora/30" "fedora/31" "oracle-linux/ol7")
- dirs=("amzn/2" "centos/7" "centos/8" "debian/9" "debian/10" "fedora/29" "fedora/30" "fedora/31" "ol/7")
- |
for dir in ${dirs[@]}; do \
platform=${dir%%/*} &&\
mkdir -p "btfs-amd64/${platform}" "btfs-arm64/${platform}" &&\
eval "mv ${dir}/x86_64/*.btf.tar.xz btfs-amd64/${platform}/" &&\
eval "mv ${dir}/arm64/*.btf.tar.xz btfs-arm64/${platform}/"; \
done
# Handle the amzn/1 directory separately because it doesn't have an arm64 version
- mv amzn/1/x86_64/* btfs-amd64/amzn/
# Handle the amazon 2018 (amazon 1) directory separately because it doesn't have an arm64 version
- mv amzn/2018/x86_64/* btfs-amd64/amzn/
# Handle ubuntu separately because we want to keep the btfs separated by ubuntu version
- mkdir -p btfs-amd64/ubuntu/18.04 btfs-amd64/ubuntu/20.04 btfs-arm64/ubuntu/18.04 btfs-arm64/ubuntu/20.04
- mv ubuntu/18.04/x86_64/*.btf.tar.xz btfs-amd64/ubuntu/18.04/
Expand All @@ -157,13 +163,15 @@ build_processed_btfhub_archive:
# Clean up platform names to match the names we get at runtime from gopsutil
- mv btfs-amd64/amzn btfs-amd64/amazon
- mv btfs-arm64/amzn btfs-arm64/amazon
- mv btfs-amd64/oracle-linux btfs-amd64/oracle
- mv btfs-arm64/oracle-linux btfs-arm64/oracle
- mv btfs-amd64/ol btfs-amd64/oracle
- mv btfs-arm64/ol btfs-arm64/oracle
# Store results in S3
- tar -czf btfs-arm64.tar.gz btfs-arm64
- tar -czf btfs-amd64.tar.gz btfs-amd64
- $S3_CP_CMD btfs-arm64.tar.gz $S3_PERMANENT_ARTIFACTS_URI/btfs-arm64.tar.gz
- $S3_CP_CMD btfs-amd64.tar.gz $S3_PERMANENT_ARTIFACTS_URI/btfs-amd64.tar.gz
- $S3_CP_CMD btfs-arm64.tar.gz $S3_DD_AGENT_OMNIBUS_BTFS_URI/btfs-arm64.tar.gz --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
- $S3_CP_CMD btfs-amd64.tar.gz $S3_DD_AGENT_OMNIBUS_BTFS_URI/btfs-amd64.tar.gz --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
artifacts:
expire_in: 2 weeks
paths:
Expand Down
1 change: 1 addition & 0 deletions .gitlab/functional_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ include:
- /.gitlab/functional_test/security_agent.yml
- /.gitlab/functional_test/system_probe.yml
- /.gitlab/functional_test/serverless.yml
- /.gitlab/functional_test/regression_detector.yml
Loading

0 comments on commit dcbf036

Please sign in to comment.