Adding upstream version 1.12.1.upstream/1.12.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 8 insertions, 91 deletions

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 248e627a2..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-dist: trusty
-sudo: true
-language: c
-services:
-- docker
-
-stages:
-- test
-- build
-- name: packaging
-  if: branch = master AND type != pull_request AND type != cron
-- name: nightlies
-  if: branch = master AND type = cron
-
-jobs:
-  include:
-  - stage: test
-    name: C
-    install: sudo apt-get install -y libcap2-bin zlib1g-dev uuid-dev fakeroot libipmimonitoring-dev libmnl-dev libnetfilter-acct-dev
-    script: fakeroot ./netdata-installer.sh --install $HOME --dont-wait --dont-start-it --enable-plugin-nfacct --enable-plugin-freeipmi --disable-lto && $HOME/netdata/usr/sbin/netdata -W unittest
-    env: CFLAGS='-O1 -DNETDATA_INTERNAL_CHECKS=1 -DNETDATA_VERIFY_LOCKS=1'
-  - name: dashboard.js
-    script: cp web/gui/dashboard.js /tmp/dashboard.js && ./build/build.sh && diff /tmp/dashboard.js web/gui/dashboard.js
-  - name: coverity
-    install: sudo apt-get install -y zlib1g-dev uuid-dev libipmimonitoring-dev libmnl-dev libnetfilter-acct-dev
-    script: ./coverity-scan.sh || echo "Coverity failed :("
-    env: INSTALL_COVERITY="true"
-    if: type = cron
-
-  - stage: build
-# TODO(paulfantom): enable when travis OSX become stable. Probably after 12.01.2019
-#    name: OSX
-#    install: brew install fakeroot ossp-uuid
-#    script: fakeroot ./netdata-installer.sh --install $HOME --dont-wait --dont-start-it
-#    os: osx
-#  - name: ubuntu 14.04 (not containerized)
-    name: ubuntu 14.04 (not containerized)
-    install: sudo apt-get install -y libcap2-bin zlib1g-dev uuid-dev fakeroot
-    script: fakeroot ./netdata-installer.sh --dont-wait --dont-start-it --install $HOME
-  - name: build container (alpine installation)
-    script: ./packaging/docker/build.sh
-    env: DEVEL="true"
-  - name: ubuntu 18.04 + lifecycle
-    script: docker run -it -v "${PWD}:/code:rw" -w /code "netdata/os-test:ubuntu1804" bats --tap tests/lifecycle.bats
-  - name: CentOS 7
-    script: docker run -it -v "${PWD}:/code:rw" -w /code "netdata/os-test:centos7" ./netdata-installer.sh --dont-wait --dont-start-it --install /tmp
-  - name: CentOS 6
-    script: docker run -it -v "${PWD}:/code:rw" -w /code "netdata/os-test:centos6" ./netdata-installer.sh --dont-wait --dont-start-it --install /tmp
-
-  - stage: packaging
-    name: Create release (only on special commit msg)
-    install:
-    - sudo apt-get install -y gnupg libcap2-bin zlib1g-dev uuid-dev fakeroot python-pip
-    - sudo apt install -y --only-upgrade docker-ce
-    - docker info
-    before_script: sudo pip install git-semver
-    script: ".travis/releaser.sh && .travis/labeler.sh" # labeler should be replaced with GitHub Actions when they hit GA
-    git:
-      depth: false
-
-  - stage: nightlies
-    name: Nightly build
-    before_install: openssl aes-256-cbc -K $encrypted_8daf19481253_key -iv $encrypted_8daf19481253_iv -in .travis/gcs-credentials.json.enc -out .travis/gcs-credentials.json -d
-    install:
-    - sudo apt-get install -y gnupg libcap2-bin zlib1g-dev uuid-dev fakeroot
-    - sudo apt install -y --only-upgrade docker-ce
-    - docker info
-    script: ".travis/nightlies.sh"
-    git:
-      depth: false
-    deploy:
-      provider: gcs
-      edge:
-        branch: gcs-ng
-      project_id: netdata-storage
-      credentials: .travis/gcs-credentials.json
-      bucket: "netdata-nightlies"
-      skip_cleanup: true
-      local_dir: "artifacts"
-
-notifications:
-  webhooks: https://app.fossa.io/hooks/travisci
-  slack:
-    rooms:
-      - secure: "NuW1p7s+WGLcyhEceeiLRSV1JgAc6N47zgdSsYoxrjSFRQHDfc8jensypDcEJwgs1K2Hcve9iKRaAddEHEw7AkS6rie9gFR5HmmbKXfW2GFMqOr6maYTFsvaECPqiWk1n9/XnRLsAi5kZ8HxH+a8ldb/eaVoFQesY1jPXgh11BM5DwvpXjEtwg0WGASsKiymvnXFS3KcC+sR7Lln2GX1a8vfCX2I3TEmOedKMlSHUy5JilGGC3AWA0SWS8tR8PUH0u3dHL5j0RNIr1RO3Yx24QgUpg/YpvKymnW/iIIEOq2vb2mBhhiKEQjJ1djUL4VSPzjIDpUzThVpKaHk3syOp6W9qZEHKhR/sqjc5Yk2XRjsw1cM0nS60gaCgxtKhEMKWcjtvWf04oJAVrmcUwcYXj0eA+jgRCZl5VhyufK/fUJavjOfsQGjwhdjxQfwDCw33W17ypJUt4GZngdb6jbIhEOcKHSLQDu1vuHTw82hJJkthkmR59PX30qJdl/MEGcfVLdN/fkCokjR/qwfmkNwQm+wYSKsK/Jq4RgBT0/oZwY3e8nkCq2ov7lBbDO3/0rzQKWZ9Uy//tnoCM3vGhDwGHQxsHshv7g6KwdhYTcmm7WWWIucfLupcjFUO1HbRuJ+7ZnvxRRwKiV+MGkFT2SNJkS8q1/jCu9KGbmktd0WUSE="
diff --git a/.travis/create_artifacts.sh b/.travis/create_artifacts.sh
index ca0724e19..fe75f0f70 100755
--- a/.travis/create_artifacts.sh
+++ b/.travis/create_artifacts.sh
@@ -27,10 +27,10 @@ echo "--- Create self-extractor ---"
 # Needed fo GCS
 echo "--- Copy artifacts to separate directory ---"
 #shellcheck disable=SC2164
+cp packaging/version artifacts/latest-version.txt
 cd artifacts
 ln -s "${BASENAME}.tar.gz" netdata-latest.tar.gz
 ln -s "${BASENAME}.gz.run" netdata-latest.gz.run
 sha256sum -b ./* >"sha256sums.txt"
 echo "checksums:"
 cat sha256sums.txt
-
diff --git a/.travis/generate_changelog.sh b/.travis/generate_changelog.sh
index d1b72e071..4ae69f1c7 100755
--- a/.travis/generate_changelog.sh
+++ b/.travis/generate_changelog.sh
@@ -9,7 +9,7 @@ fi
 
 ORGANIZATION=$(echo "$TRAVIS_REPO_SLUG" | awk -F '/' '{print $1}')
 PROJECT=$(echo "$TRAVIS_REPO_SLUG" | awk -F '/' '{print $2}')
-GIT_MAIL=${GIT_MAIL:-"pawel+bot@netdata.cloud"}
+GIT_MAIL=${GIT_MAIL:-"bot@netdata.cloud"}
 GIT_USER=${GIT_USER:-"netdatabot"}
 
 if [ -z ${GIT_TAG+x} ]; then
diff --git a/.travis/nightlies.sh b/.travis/nightlies.sh
index fd133d08a..8e867416e 100755
--- a/.travis/nightlies.sh
+++ b/.travis/nightlies.sh
@@ -7,7 +7,7 @@ if [ ! -f .gitignore ]; then
 	exit 1
 fi
 
-export GIT_MAIL="pawel+bot@netdata.cloud"
+export GIT_MAIL="bot@netdata.cloud"
 export GIT_USER="netdatabot"
 echo "--- Initialize git configuration ---"
 git config user.email "${GIT_MAIL}"
diff --git a/.travis/releaser.sh b/.travis/releaser.sh
index 870dec52c..c40f4c1bc 100755
--- a/.travis/releaser.sh
+++ b/.travis/releaser.sh
@@ -29,7 +29,7 @@ if [ ! -f .gitignore ]; then
 	exit 1
 fi
 
-export GIT_MAIL="pawel+bot@netdata.cloud"
+export GIT_MAIL="bot@netdata.cloud"
 export GIT_USER="netdatabot"
 echo "--- Initialize git configuration ---"
 git config user.email "${GIT_MAIL}"
@@ -87,8 +87,10 @@ if [ "${GIT_TAG}" != "$(git tag --points-at)" ]; then
 	echo "ERROR! Current commit is not tagged. Stopping release creation."
 	exit 1
 fi
-hub release create --draft \
+until hub release create --draft \
 		-a "artifacts/netdata-${GIT_TAG}.tar.gz" \
 		-a "artifacts/netdata-${GIT_TAG}.gz.run" \
 		-a "artifacts/sha256sums.txt" \
-		-m "${GIT_TAG}" "${GIT_TAG}"
+		-m "${GIT_TAG}" "${GIT_TAG}"; do
+	sleep 5
+done