diff options
author | Mansour Behabadi <57921115+ncmans@users.noreply.github.com> | 2019-12-20 23:16:23 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-20 23:16:23 +1100 |
commit | d0e424144749a9748c5de4f0888d8e8ec5647b78 (patch) | |
tree | 664323313c1325d6703ba3b9f660ee2c74fa57ac | |
parent | 91a8e3bb23b879e8312f848ffef560299bcbe43b (diff) |
packaging: Set default release channel to stable for gh releases (#7399)
* packaging: Set default release channel to stable for gh releases
* Leave kickstart files alone
* Update .travis/create_artifacts.sh
Co-Authored-By: Konstantinos Natsakis <5933427+knatsakis@users.noreply.github.com>
Co-authored-by: Mansour Behabadi <mansour@oxplot.com>
Co-authored-by: Konstantinos Natsakis <5933427+knatsakis@users.noreply.github.com>
-rw-r--r-- | .travis.yml | 2 | ||||
-rwxr-xr-x | .travis/create_artifacts.sh | 7 | ||||
-rwxr-xr-x | netdata-installer.sh | 5 | ||||
-rw-r--r-- | packaging/installer/README.md | 1 | ||||
-rwxr-xr-x | packaging/makeself/install-or-update.sh | 4 |
5 files changed, 17 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 8ca7169411..acb3565071 100644 --- a/.travis.yml +++ b/.travis.yml @@ -509,6 +509,8 @@ jobs: - name: Create release draft git: depth: false + env: + - RELEASE_CHANNEL=stable before_script: post_message "TRAVIS_MESSAGE" "Drafting release on github" "${NOTIF_CHANNEL}" script: - echo "GIT Branch:" && git branch diff --git a/.travis/create_artifacts.sh b/.travis/create_artifacts.sh index 8704811b69..ce764469f9 100755 --- a/.travis/create_artifacts.sh +++ b/.travis/create_artifacts.sh @@ -31,6 +31,13 @@ echo "--- Initialize git configuration ---" git checkout "${1-master}" git pull +if [ "${RELEASE_CHANNEL}" == stable ]; then + echo "--- Set default release channel to stable ---" + sed -i 's/^RELEASE_CHANNEL="nightly" *#/RELEASE_CHANNEL="stable" #/' \ + netdata-installer.sh \ + packaging/makeself/install-or-update.sh +fi + # Everything from this directory will be uploaded to GCS mkdir -p artifacts BASENAME="netdata-$(git describe)" diff --git a/netdata-installer.sh b/netdata-installer.sh index 4e4f21cc6a..601549d049 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -155,6 +155,8 @@ USAGE: ${PROGRAM} [options] --auto-update or -u Install netdata-updater in cron to update netdata automatically once per day --stable-channel Use packages from GitHub release pages instead of GCS (nightly updates). This results in less frequent updates. + --nightly-channel Use most recent nightly udpates instead of GitHub releases. + This results in more frequent updates. --disable-go Disable installation of go.d.plugin. --enable-plugin-freeipmi Enable the FreeIPMI plugin. Default: enable it when libipmimonitoring is available. --disable-plugin-freeipmi @@ -202,7 +204,7 @@ AUTOUPDATE=0 NETDATA_PREFIX= LIBS_ARE_HERE=0 NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS-}" -RELEASE_CHANNEL="nightly" +RELEASE_CHANNEL="nightly" # check .travis/create_artifacts.sh before modifying IS_NETDATA_STATIC_BINARY="${IS_NETDATA_STATIC_BINARY:-"no"}" while [ -n "${1}" ]; do case "${1}" in @@ -212,6 +214,7 @@ while [ -n "${1}" ]; do "--dont-wait") DONOTWAIT=1;; "--auto-update"|"-u") AUTOUPDATE=1;; "--stable-channel") RELEASE_CHANNEL="stable";; + "--nightly-channel") RELEASE_CHANNEL="nightly";; "--enable-plugin-freeipmi") NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS//--enable-plugin-freeipmi/} --enable-plugin-freeipmi";; "--disable-plugin-freeipmi") NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS//--disable-plugin-freeipmi/} --disable-plugin-freeipmi";; "--disable-https") NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS//--disable-https/} --disable-https";; diff --git a/packaging/installer/README.md b/packaging/installer/README.md index ffde6fc6b3..6805696702 100644 --- a/packaging/installer/README.md +++ b/packaging/installer/README.md @@ -65,6 +65,7 @@ The `kickstart.sh` script passes all its parameters to `netdata-installer.sh`, s - `--dont-wait`: Enable automated installs by not prompting for permission to install any required packages. - `--dont-start-it`: Prevent the installer from starting Netdata automatically. - `--stable-channel`: Automatically update only on the release of new major versions. +- `--nightly-channel`: Automatically update on every new nightly build. - `--no-updates`: Prevent automatic updates of any kind. - `--local-files`: Used for offline installations. Pass four file paths: the Netdata tarball, the checksum file, the go.d plugin tarball, and the go.d plugin config tarball, to force kickstart run the process using those files. diff --git a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh index afbe83530e..c287fd38c1 100755 --- a/packaging/makeself/install-or-update.sh +++ b/packaging/makeself/install-or-update.sh @@ -25,14 +25,16 @@ fi STARTIT=1 AUTOUPDATE=0 -RELEASE_CHANNEL="nightly" +RELEASE_CHANNEL="nightly" # check .travis/create_artifacts.sh before modifying while [ "${1}" ]; do case "${1}" in "--dont-start-it") STARTIT=0;; "--auto-update"|"-u") AUTOUPDATE=1;; "--stable-channel") RELEASE_CHANNEL="stable";; + "--nightly-channel") RELEASE_CHANNEL="nightly";; "--disable-telemetry") DISABLE_TELEMETRY=1;; + *) echo >&2 "Unknown option '${1}'. Ignoring it.";; esac shift 1 |