Skip to content

Commit

Permalink
also add here, just get passing then take out
Browse files Browse the repository at this point in the history
  • Loading branch information
hughesjj committed Sep 26, 2024
1 parent 1c0485b commit 5c4ef73
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion internal/buildscripts/packaging/tests/installer_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,8 @@ def test_installer_with_instrumentation_custom(distro, arch, method, sdk):

buildargs = {"NODE_VERSION": f"v{node_version}"}

print(f"Testing installation on {distro} from {STAGE} stage ...")
dockerfile = get_instrumentation_dockerfile(distro)
print(f"Testing installation on {distro} from {STAGE} stage with dockerfile {dockerfile} ...")
with run_distro_container(distro, dockerfile=dockerfile, arch=arch, buildargs=buildargs) as container:
copy_file_into_container(container, INSTALLER_PATH, "/test/install.sh")
run_container_cmd(container, f"sh -c 'echo \"# This line should be preserved\" >> {PRELOAD_PATH}'")
Expand All @@ -544,6 +544,14 @@ def test_installer_with_instrumentation_custom(distro, arch, method, sdk):
# set global=true for npm to test that splunk-otel-js is still installed locally
run_container_cmd(container, "sh -l -c 'npm config set global true'")

if distro in ("opensuse-15", ):
# This really, really shouldn't be needed
run_container_cmd(container, "zypper -n install -y procps")
run_container_cmd(container, "pgrep --help")
run_container_cmd(container, "pgrep -f init")
run_container_cmd(container, "sh -c 'pgrep -f init'")
run_container_cmd(container, "sh -ec 'pgrep -f init'")

service_name = f"service_name_from_{method}"
environment = f"deployment_environment_from_{method}"

Expand Down

0 comments on commit 5c4ef73

Please sign in to comment.