diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-01-16 07:27:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 07:27:47 -0500 |
| commit | 81251da72c50c0b9efe9efced75452069c4834cb (patch) | |
| tree | 80fccfe06cbb1a17bd24eb7321e84fb818177954 /.travis | |
| parent | d6c35a1a43ae04dfd0817512b5aacad3287bb8d1 (diff) | |
Move the script for installing required packages into the main repo. (#7563)
* Move the script for installing required packages into the main repo.
Based on discussion with Costa.
Most of what this script is actually used for directly is in the main
repo anyway, so it makes more sense to have it there so that any changes
get reviewed properly.
* Fix typo in RPM package build setup.
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/package_management/configure_deb_lxc_environment.py | 2 | ||||
| -rwxr-xr-x | .travis/package_management/configure_rpm_lxc_environment.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis/package_management/configure_deb_lxc_environment.py b/.travis/package_management/configure_deb_lxc_environment.py index 3c8a7689c9..6dee1a6b56 100755 --- a/.travis/package_management/configure_deb_lxc_environment.py +++ b/.travis/package_management/configure_deb_lxc_environment.py @@ -63,7 +63,7 @@ common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libnet common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "libcups2-dev"]) 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, ["wget", "-T", "15", "-O", "%s/.install-required-packages.sh" % build_path, "https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/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") diff --git a/.travis/package_management/configure_rpm_lxc_environment.py b/.travis/package_management/configure_rpm_lxc_environment.py index 79d34608fc..4dca0bf384 100755 --- a/.travis/package_management/configure_rpm_lxc_environment.py +++ b/.travis/package_management/configure_rpm_lxc_environment.py @@ -49,7 +49,7 @@ common.run_command(container, ["useradd", "-m", os.environ['BUILDER_NAME']]) 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, ["wget", "-T", "15", "-O", "/home/%s/.install-required-packages.sh" % (os.environ['BUILDER_NAME']), "https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/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 |