diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-07-30 07:09:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 07:09:59 -0400 |
| commit | 8a105bad8188b7581c92811c069676d3110f130b (patch) | |
| tree | 0c6358e5c8c5f7b25436760b298b0de3107f4a1f /.travis | |
| parent | fdbc559ff9c317ce6cf42a72ea466a2b47211971 (diff) | |
Added eBPF collector support to DEB and RPM packages. (#9628)
* Add DEB/RPM package build tests to Travis.
* Add working support for bundling eBPF in binary packages.
* Show stdout and stderr from commands run in LXC.
* Add proper bundling code for libbpf.
* Use AC_CHECK_FILE for libbpf.a external dep.
This way it gets properly logged in both configure output and the
configure log.
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/package_management/common.py | 2 | ||||
| -rw-r--r-- | .travis/package_management/functions.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis/package_management/common.py b/.travis/package_management/common.py index 7999d8be25..61cf358737 100755 --- a/.travis/package_management/common.py +++ b/.travis/package_management/common.py @@ -51,7 +51,7 @@ def replace_tag(tag_name, spec, new_tag_content): def run_command(container, command): print("Running command: %s" % command) - command_result = container.attach_wait(lxc.attach_run_command, command) + command_result = container.attach_wait(lxc.attach_run_command, command, stdout=sys.stdout.buffer, stderr=sys.stdout.buffer) if command_result != 0: raise Exception("Command failed with exit code %d" % command_result) diff --git a/.travis/package_management/functions.sh b/.travis/package_management/functions.sh index 0c4425fa50..0c00d2fcb2 100644 --- a/.travis/package_management/functions.sh +++ b/.travis/package_management/functions.sh @@ -24,8 +24,8 @@ function detect_arch_from_commit { ;; *) - echo "Unknown build architecture in '${TRAVIS_COMMIT_MESSAGE}'. No BUILD_ARCH can be provided" - exit 1 + echo "Unknown build architecture in '${TRAVIS_COMMIT_MESSAGE}'. Assuming amd64" + export BUILD_ARCH="amd64" ;; esac |