diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-08-03 02:17:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 16:17:48 +1000 |
| commit | 5f160bea3058cb5f806b1a402ef999b99880300c (patch) | |
| tree | 6624ac6fdffe4cb63d1f03c017b2aca15379b5ee /.github | |
| parent | a956a27c47072c87a485495b5f5a852952fec095 (diff) | |
Require cloud build to succeed in make dist checks. (#9218)
* 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.
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/scripts/run_install_with_dist_file.sh | 5 | ||||
| -rw-r--r-- | .github/workflows/checks.yml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/scripts/run_install_with_dist_file.sh b/.github/scripts/run_install_with_dist_file.sh index 519693f4db..9453dff359 100755 --- a/.github/scripts/run_install_with_dist_file.sh +++ b/.github/scripts/run_install_with_dist_file.sh @@ -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 @@ -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!" diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 1e56431710..46b88ca43d 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -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 |