@cryptotaxi247 / netdata-1 / commits / d0e424144

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>

Mansour Behabadi committed Dec 20, 2019 at 23:16 UTC d0e424144749a9748c5de4f0888d8e8ec5647b78
5 files changed +17 -2
.travis.yml
+2
@@ -509,6 +509,8 @@ jobs:
509 - name: Create release draft
510 git:
511 depth: false
512 + env:
513 + - RELEASE_CHANNEL=stable
514 before_script: post_message "TRAVIS_MESSAGE" "Drafting release on github" "${NOTIF_CHANNEL}"
515 script:
516 - echo "GIT Branch:" && git branch
.travis/create_artifacts.sh
+7
@@ -31,6 +31,13 @@ echo "--- Initialize git configuration ---"
31 git checkout "${1-master}"
32 git pull
33
34 +if [ "${RELEASE_CHANNEL}" == stable ]; then
35 + echo "--- Set default release channel to stable ---"
36 + sed -i 's/^RELEASE_CHANNEL="nightly" *#/RELEASE_CHANNEL="stable" #/' \
37 + netdata-installer.sh \
38 + packaging/makeself/install-or-update.sh
39 +fi
40 +
41 # Everything from this directory will be uploaded to GCS
42 mkdir -p artifacts
43 BASENAME="netdata-$(git describe)"
netdata-installer.sh
+4 -1
@@ -155,6 +155,8 @@ USAGE: ${PROGRAM} [options]
155 --auto-update or -u Install netdata-updater in cron to update netdata automatically once per day
156 --stable-channel Use packages from GitHub release pages instead of GCS (nightly updates).
157 This results in less frequent updates.
158 + --nightly-channel Use most recent nightly udpates instead of GitHub releases.
159 + This results in more frequent updates.
160 --disable-go Disable installation of go.d.plugin.
161 --enable-plugin-freeipmi Enable the FreeIPMI plugin. Default: enable it when libipmimonitoring is available.
162 --disable-plugin-freeipmi
@@ -202,7 +204,7 @@ AUTOUPDATE=0
204 NETDATA_PREFIX=
205 LIBS_ARE_HERE=0
206 NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS-}"
205 -RELEASE_CHANNEL="nightly"
207 +RELEASE_CHANNEL="nightly" # check .travis/create_artifacts.sh before modifying
208 IS_NETDATA_STATIC_BINARY="${IS_NETDATA_STATIC_BINARY:-"no"}"
209 while [ -n "${1}" ]; do
210 case "${1}" in
@@ -212,6 +214,7 @@ while [ -n "${1}" ]; do
214 "--dont-wait") DONOTWAIT=1;;
215 "--auto-update"|"-u") AUTOUPDATE=1;;
216 "--stable-channel") RELEASE_CHANNEL="stable";;
217 + "--nightly-channel") RELEASE_CHANNEL="nightly";;
218 "--enable-plugin-freeipmi") NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS//--enable-plugin-freeipmi/} --enable-plugin-freeipmi";;
219 "--disable-plugin-freeipmi") NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS//--disable-plugin-freeipmi/} --disable-plugin-freeipmi";;
220 "--disable-https") NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS//--disable-https/} --disable-https";;
packaging/installer/README.md
+1
@@ -65,6 +65,7 @@ The `kickstart.sh` script passes all its parameters to `netdata-installer.sh`, s
65 - `--dont-wait`: Enable automated installs by not prompting for permission to install any required packages.
66 - `--dont-start-it`: Prevent the installer from starting Netdata automatically.
67 - `--stable-channel`: Automatically update only on the release of new major versions.
68 +- `--nightly-channel`: Automatically update on every new nightly build.
69 - `--no-updates`: Prevent automatic updates of any kind.
70 - `--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.
71
packaging/makeself/install-or-update.sh
+3 -1
@@ -25,14 +25,16 @@ fi
25
26 STARTIT=1
27 AUTOUPDATE=0
28 -RELEASE_CHANNEL="nightly"
28 +RELEASE_CHANNEL="nightly" # check .travis/create_artifacts.sh before modifying
29
30 while [ "${1}" ]; do
31 case "${1}" in
32 "--dont-start-it") STARTIT=0;;
33 "--auto-update"|"-u") AUTOUPDATE=1;;
34 "--stable-channel") RELEASE_CHANNEL="stable";;
35 + "--nightly-channel") RELEASE_CHANNEL="nightly";;
36 "--disable-telemetry") DISABLE_TELEMETRY=1;;
37 +
38 *) echo >&2 "Unknown option '${1}'. Ignoring it.";;
39 esac
40 shift 1