diff options
author | Paul Emm. Katsoulakis <34388743+paulkatsoulakis@users.noreply.github.com> | 2019-07-17 22:22:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-17 22:22:21 +0200 |
commit | e588f9608d8e23b001c117a09a39990d001f390f (patch) | |
tree | 33f38deeb0a499b2f1ad020fe77ec45ed157e6ba /.travis | |
parent | 65196fdf06a2047f24cf2030399dd22202a14d03 (diff) |
netdata/packaging: Enable built-in support for prometheus remote write in packaging (#6480)
* netdata/packaging: [ci skip] Add prometheus remote write plugin deps
* netdata/packaging: [ci skip] adjust for the tests
* netdata/packaging: [ci skip] Apparently we need proto-c too
* netdata/packaging: [ci skip] Add dependencies also
* netdata/packaging: [ci skip] fix suse dependency
* netdata/packaging: [ci skip] epel-release should always go first dumdum
* netdata/packaging: [ci skip] g++ needed for prometheus
* netdata/packaging: First prepare the repo, then start throwing in packages
* netdata/packaging: [ci skip] fix attempt for missing snappy on some debian-based packages
* netdata/packaging: [ci skip] protobuf compiler dep
* netdata/packaging: [ci skip] Add the generic maintainer info and the new website. Also stop pushing snappy to Debian/Stretch, doesnt have it
* netdata/packaging: [ci skip] Remove branch dev setup
* Empty commit to re-trigger Travis
Diffstat (limited to '.travis')
-rwxr-xr-x | .travis/package_management/common.py | 54 | ||||
-rwxr-xr-x | .travis/package_management/configure_deb_lxc_environment.py | 9 | ||||
-rwxr-xr-x | .travis/package_management/configure_rpm_lxc_environment.py | 12 |
3 files changed, 56 insertions, 19 deletions
diff --git a/.travis/package_management/common.py b/.travis/package_management/common.py index 5913960793..6e7a260230 100755 --- a/.travis/package_management/common.py +++ b/.travis/package_management/common.py @@ -61,43 +61,73 @@ def run_command_in_host(cmd): print('Error: ' + e.decode('ascii')) print('code: ' + str(proc.returncode)) -def install_common_dependendencies(container): +def prepare_repo(container): if str(os.environ["REPO_TOOL"]).count("zypper") == 1: run_command(container, [os.environ["REPO_TOOL"], "clean", "-a"]) run_command(container, [os.environ["REPO_TOOL"], "--no-gpg-checks", "update", "-y"]) - run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "json-glib-devel"]) - run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "freeipmi-devel"]) - run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "cups-devel"]) elif str(os.environ["REPO_TOOL"]).count("yum") == 1: run_command(container, [os.environ["REPO_TOOL"], "clean", "all"]) run_command(container, [os.environ["REPO_TOOL"], "update", "-y"]) - run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "json-c-devel"]) - run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "freeipmi-devel"]) - run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "cups-devel"]) if os.environ["BUILD_STRING"].count("el/7") == 1 and os.environ["BUILD_ARCH"].count("i386") == 1: print ("Skipping epel-release install for %s-%s" % (os.environ["BUILD_STRING"], os.environ["BUILD_ARCH"])) else: run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "epel-release"]) + elif str(os.environ["REPO_TOOL"]).count("apt-get") == 1: run_command(container, [os.environ["REPO_TOOL"], "update", "-y"]) + else: + run_command(container, [os.environ["REPO_TOOL"], "update", "-y"]) + + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "sudo"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "wget"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "bash"]) + +def install_common_dependendencies(container): + if str(os.environ["REPO_TOOL"]).count("zypper") == 1: + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "gcc-c++"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "json-glib-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "freeipmi-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "cups-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "snappy-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-c"]) + + elif str(os.environ["REPO_TOOL"]).count("yum") == 1: + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "gcc-c++"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "json-c-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "freeipmi-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "cups-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "snappy-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-c-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-compiler"]) + + elif str(os.environ["REPO_TOOL"]).count("apt-get") == 1: + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "g++"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libipmimonitoring-dev"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libjson-c-dev"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libcups2-dev"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libsnappy-dev"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libprotobuf-dev"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libprotoc-dev"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-compiler"]) + if os.environ["BUILD_STRING"].count("debian/jessie") == 1: + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "snappy"]) else: + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "gcc-c++"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "cups-devel"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "freeipmi-devel"]) run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "json-c-devel"]) - run_command(container, [os.environ["REPO_TOOL"], "update", "-y"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "snappy-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-c-devel"]) + run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "protobuf-compiler"]) if os.environ["BUILD_STRING"].count("el/6") <= 0: run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "autogen"]) - run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "sudo"]) - run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "wget"]) - run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "bash"]) - def prepare_version_source(dest_archive, pkg_friendly_version, tag=None): print(".0 Preparing local implementation tarball for version %s" % pkg_friendly_version) tar_file = os.environ['LXC_CONTAINER_ROOT'] + dest_archive diff --git a/.travis/package_management/configure_deb_lxc_environment.py b/.travis/package_management/configure_deb_lxc_environment.py index 91aa4c8c49..12328dde74 100755 --- a/.travis/package_management/configure_deb_lxc_environment.py +++ b/.travis/package_management/configure_deb_lxc_environment.py @@ -47,8 +47,8 @@ print("1. Adding user %s" % os.environ['BUILDER_NAME']) common.run_command(container, ["useradd", "-m", os.environ['BUILDER_NAME']]) # Fetch package dependencies for the build -print("2. Installing package dependencies within LXC container") -common.install_common_dependendencies(container) +print("2. Preparing repo on LXC container") +common.prepare_repo(container) print("2.1 Install .DEB build support packages") common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "dpkg-dev"]) @@ -62,10 +62,13 @@ print("2.2 Add more dependencies") common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libnetfilter-acct-dev"]) common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libcups2-dev"]) -print ("3. Run install-required-packages scriptlet") +print ("3.1 Run install-required-packages scriptlet") common.run_command(container, ["wget", "-T", "15", "-O", "%s/.install-required-packages.sh" % build_path, "https://raw.githubusercontent.com/netdata/netdata-demo-site/master/install-required-packages.sh"]) common.run_command(container, ["bash", "%s/.install-required-packages.sh" % build_path, "netdata", "--dont-wait", "--non-interactive"]) +print("3.2 Installing package dependencies within LXC container") +common.install_common_dependendencies(container) + friendly_version="" dest_archive="" download_url="" diff --git a/.travis/package_management/configure_rpm_lxc_environment.py b/.travis/package_management/configure_rpm_lxc_environment.py index e507b6976f..79d34608fc 100755 --- a/.travis/package_management/configure_rpm_lxc_environment.py +++ b/.travis/package_management/configure_rpm_lxc_environment.py @@ -46,11 +46,15 @@ print("1. Adding user %s" % os.environ['BUILDER_NAME']) common.run_command(container, ["useradd", "-m", os.environ['BUILDER_NAME']]) # Fetch package dependencies for the build -print("2. Installing package dependencies within LXC container") -common.install_common_dependendencies(container) +print("2.1 Preparing repo on LXC container") +common.prepare_repo(container) + +common.run_command(container, ["wget", "-T", "15", "-O", "/home/%s/.install-required-packages.sh" % (os.environ['BUILDER_NAME']), "https://raw.githubusercontent.com/netdata/netdata-demo-site/master/install-required-packages.sh"]) +common.run_command(container, ["bash", "/home/%s/.install-required-packages.sh" % (os.environ['BUILDER_NAME']), "netdata", "--dont-wait", "--non-interactive"]) # Exceptional cases, not available everywhere # +print("2.2 Running uncommon dependencies and preparing LXC environment") # Not on Centos-7 if os.environ["BUILD_STRING"].count("el/7") <= 0: common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libnetfilter_acct-devel"]) @@ -59,8 +63,8 @@ if os.environ["BUILD_STRING"].count("el/7") <= 0: if os.environ["BUILD_STRING"].count("el/6") <= 0: common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "autoconf-archive"]) -common.run_command(container, ["wget", "-T", "15", "-O", "/home/%s/.install-required-packages.sh" % (os.environ['BUILDER_NAME']), "https://raw.githubusercontent.com/netdata/netdata-demo-site/master/install-required-packages.sh"]) -common.run_command(container, ["bash", "/home/%s/.install-required-packages.sh" % (os.environ['BUILDER_NAME']), "netdata", "--dont-wait", "--non-interactive"]) +print("2.3 Installing common dependencies") +common.install_common_dependendencies(container) print("3. Setting up macros") common.run_command(container, ["sudo", "-u", os.environ['BUILDER_NAME'], "/bin/echo", "'%_topdir %(echo /home/" + os.environ['BUILDER_NAME'] + ")/rpmbuild' > /home/" + os.environ['BUILDER_NAME'] + "/.rpmmacros"]) |