Skip to content

Commit

Permalink
Require cloud build to succeed in make dist checks. (#9218)
Browse files Browse the repository at this point in the history
* Require cloud build to succeed in make dist checks.

* perform dist check the same way we normally do builds.

The default behavior in `kickstart.sh` is to run
`install-required-packages.sh` with just the `netdata` package set, and
we don't even document how to make it run with `netdata-all`, so a vast
majority of users will only be running using the `netdata` package set.

* More accurately recreate the environment a user would be building in.

We should be testing our distfiles against our current version of
`install-required-packages.sh`, not some pre-generated test image that
we have to manage ina separaterepo.

Also, disable telemetry for the test build so we don't accidentally
pollute the stats.
  • Loading branch information
Ferroin committed Aug 3, 2020
1 parent a956a27 commit 5f160be
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/scripts/run_install_with_dist_file.sh
Expand Up @@ -19,6 +19,7 @@ shift
printf >&2 "Opening dist archive %s ... " "${distfile}"
tar -xovf "${distfile}"
distdir="$(echo "${distfile}" | cut -d. -f1,2,3)"
cp -a packaging/installer/install-required-packages.sh "${distdir}/install-required-packages.sh"
if [ ! -d "${distdir}" ]; then
printf >&2 "ERROR: %s is not a directory" "${distdir}"
exit 2
Expand All @@ -30,8 +31,8 @@ pushd "${distdir}" || exit 1
docker run \
-v "${PWD}:/netdata" \
-w /netdata \
"netdata/os-test:centos7" \
/bin/bash -c "./netdata-installer.sh --dont-wait --install /tmp && echo \"Validating netdata instance is running\" && wget -O - 'http://127.0.0.1:19999/api/v1/info' | grep version"
"ubuntu:latest" \
/bin/bash -c "./install-required-packages.sh --dont-wait --non-interactive netdata && apt install wget && ./netdata-installer.sh --dont-wait --require-cloud --disable-telemetry --install /tmp && echo \"Validating netdata instance is running\" && wget -O - 'http://127.0.0.1:19999/api/v1/info' | grep version"
popd || exit 1

echo "All Done!"
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: actions/checkout@v2
- name: Prepare environment
run: |
./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata-all
./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata
sudo apt-get install -y libjson-c-dev libipmimonitoring-dev libcups2-dev libsnappy-dev \
libprotobuf-dev libprotoc-dev libssl-dev protobuf-compiler \
libnetfilter-acct-dev
Expand Down

0 comments on commit 5f160be

Please sign in to comment.