Skip to content

Commit 2a13151

Browse files
OnBoarding tests: allow install datadog-apm-inject from file (#1947)
* OnBoarding tests: allow install datadog-apm-inject from file (host + container)
1 parent e9a28df commit 2a13151

File tree

2 files changed

+74
-4
lines changed

2 files changed

+74
-4
lines changed

tests/onboarding/infra_provision/includes/provision_lib_injection_container_manual.yml

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,57 @@
22
- os_type: linux
33
os_distro: deb
44
copy_files:
5+
- name: copy-binaries
6+
local_path: binaries/
57
- name: copy-docker-config
68
local_path: tests/onboarding/autoinjection/docker/docker_config.yaml
79
- name: copy-tracer-debug-config
810
local_path: tests/onboarding/autoinjection/tracer_debug/debug_config.yaml
911
command: |
10-
sudo apt-get install -y -t $DD_deb_repo_name datadog-apm-inject datadog-apm-library-$DD_LANG
12+
architecture=""
13+
case $(uname -m) in
14+
x86_64) architecture="amd64" ;;
15+
aarch64) architecture="arm64" ;;
16+
esac
17+
18+
if [ -e datadog-apm-inject_*_$architecture.deb ]
19+
then
20+
echo "Instaling datadog-apm-inject from local folder"
21+
sudo apt install ./datadog-apm-inject_*_$architecture.deb
22+
else
23+
echo "Instaling datadog-apm-inject from remote repository"
24+
sudo apt install -y -t $DD_deb_repo_name datadog-apm-inject
25+
fi
26+
sudo apt-get install -y -t $DD_deb_repo_name datadog-apm-library-$DD_LANG
1127
dd-container-install
1228
sudo cp docker_config.yaml /etc/datadog-agent/inject/docker_config.yaml
1329
sudo cp debug_config.yaml /etc/datadog-agent/inject/debug_config.yaml
1430
1531
- os_type: linux
1632
os_distro: rpm
1733
copy_files:
34+
- name: copy-binaries
35+
local_path: binaries/
1836
- name: copy-docker-config
1937
local_path: tests/onboarding/autoinjection/docker/docker_config.yaml
2038
- name: copy-tracer-debug-config
2139
local_path: tests/onboarding/autoinjection/tracer_debug/debug_config.yaml
2240
command: |
23-
sudo yum -y install --disablerepo="*" --enablerepo="$DD_rpm_repo_name" datadog-apm-inject datadog-apm-library-$DD_LANG
41+
architecture=""
42+
case $(uname -m) in
43+
x86_64) architecture="x86_64" ;;
44+
aarch64) architecture="aarch64" ;;
45+
esac
46+
47+
if [ -e datadog-apm-inject-*.$architecture.rpm ]
48+
then
49+
echo "Instaling datadog-apm-inject from local folder"
50+
sudo yum -y install --disablerepo="*" datadog-apm-inject-*.$architecture.rpm
51+
else
52+
echo "Instaling datadog-apm-inject from remote repository"
53+
sudo yum -y install --disablerepo="*" --enablerepo="$DD_rpm_repo_name" datadog-apm-inject
54+
fi
55+
sudo yum -y install --disablerepo="*" --enablerepo="$DD_rpm_repo_name" datadog-apm-library-$DD_LANG
2456
dd-container-install
2557
sudo cp docker_config.yaml /etc/datadog-agent/inject/docker_config.yaml
2658
sudo cp debug_config.yaml /etc/datadog-agent/inject/debug_config.yaml

tests/onboarding/infra_provision/includes/provision_lib_injection_host_manual.yml

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,58 @@
22
- os_type: linux
33
os_distro: deb
44
copy_files:
5+
- name: copy-binaries
6+
local_path: binaries/
7+
58
- name: copy-tracer-debug-config
69
local_path: tests/onboarding/autoinjection/tracer_debug/debug_config.yaml
710
command: |
8-
sudo apt install -y -t $DD_deb_repo_name datadog-apm-inject datadog-apm-library-$DD_LANG
11+
12+
architecture=""
13+
case $(uname -m) in
14+
x86_64) architecture="amd64" ;;
15+
aarch64) architecture="arm64" ;;
16+
esac
17+
18+
if [ -e datadog-apm-inject_*_$architecture.deb ]
19+
then
20+
echo "Instaling datadog-apm-inject from local folder"
21+
sudo apt install ./datadog-apm-inject_*_$architecture.deb
22+
else
23+
echo "Instaling datadog-apm-inject from remote repository"
24+
sudo apt install -y -t $DD_deb_repo_name datadog-apm-inject
25+
fi
26+
27+
sudo apt install -y -t $DD_deb_repo_name datadog-apm-library-$DD_LANG
928
dd-host-install
1029
sudo cp debug_config.yaml /etc/datadog-agent/inject/debug_config.yaml
1130
1231
- os_type: linux
1332
os_distro: rpm
1433
copy_files:
34+
- name: copy-binaries
35+
local_path: binaries/
36+
1537
- name: copy-tracer-debug-config
1638
local_path: tests/onboarding/autoinjection/tracer_debug/debug_config.yaml
1739
command: |
18-
sudo yum -y install --disablerepo="*" --enablerepo="$DD_rpm_repo_name" datadog-apm-inject datadog-apm-library-$DD_LANG
40+
41+
architecture=""
42+
case $(uname -m) in
43+
x86_64) architecture="x86_64" ;;
44+
aarch64) architecture="aarch64" ;;
45+
esac
46+
47+
if [ -e datadog-apm-inject-*.$architecture.rpm ]
48+
then
49+
echo "Instaling datadog-apm-inject from local folder"
50+
sudo yum -y install --disablerepo="*" datadog-apm-inject-*.$architecture.rpm
51+
else
52+
echo "Instaling datadog-apm-inject from remote repository"
53+
sudo yum -y install --disablerepo="*" --enablerepo="$DD_rpm_repo_name" datadog-apm-inject
54+
fi
55+
56+
sudo yum -y install --disablerepo="*" --enablerepo="$DD_rpm_repo_name" datadog-apm-library-$DD_LANG
1957
dd-host-install
2058
sudo cp debug_config.yaml /etc/datadog-agent/inject/debug_config.yaml
2159
echo "Verify package signature. Fails if it isn't V4"

0 commit comments

Comments
 (0)