diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2021-03-25 15:08:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 15:08:19 -0400 |
| commit | f3881e1cd1d2e67275ea4a66760c742b14ac430a (patch) | |
| tree | 414f4b5fc5c8a05ec2a02a63584c0f846c5a7f2a /packaging | |
| parent | 5a815b1b1f9d7fa7f9aab19be8feab8ece3d900a (diff) | |
Fix handling of binary package uploads. (#10860)
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/Dockerfile.packager | 2 | ||||
| -rwxr-xr-x | packaging/scripts/install.sh | 8 | ||||
| -rwxr-xr-x | packaging/scripts/test.sh | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/packaging/Dockerfile.packager b/packaging/Dockerfile.packager index e0591491f2..4c90f14fd8 100644 --- a/packaging/Dockerfile.packager +++ b/packaging/Dockerfile.packager @@ -36,7 +36,7 @@ ENV VERSION=$PKG_VERSION COPY ./packaging/scripts/install.sh /install.sh COPY ./packaging/scripts/test.sh /test.sh -COPY --from=build /netdata/artifacts /artifacts +COPY --from=build /netdata/artifacts /packages RUN /install.sh diff --git a/packaging/scripts/install.sh b/packaging/scripts/install.sh index dcad5aa882..c591b0bee0 100755 --- a/packaging/scripts/install.sh +++ b/packaging/scripts/install.sh @@ -7,7 +7,7 @@ install_debian_like() { apt-get update # Install NetData - apt-get install -y "/artifacts/netdata_${VERSION}_${ARCH}.deb" + apt-get install -y "/packages/netdata_${VERSION}_${ARCH}.deb" # Install testing tools apt-get install -y --no-install-recommends \ @@ -23,7 +23,7 @@ install_fedora_like() { pkg_version="$(echo "${VERSION}" | tr - .)" # Install NetData - "$PKGMGR" install -y /artifacts/netdata-"${pkg_version}"-*.rpm + "$PKGMGR" install -y /packages/netdata-"${pkg_version}"-*.rpm # Install testing tools "$PKGMGR" install -y curl nc jq @@ -41,7 +41,7 @@ install_centos() { "$PKGMGR" install -y epel-release # Install NetData - "$PKGMGR" install -y /artifacts/netdata-"${pkg_version}"-*.rpm + "$PKGMGR" install -y /packages/netdata-"${pkg_version}"-*.rpm # Install testing tools "$PKGMGR" install -y curl nc jq @@ -56,7 +56,7 @@ install_suse_like() { # Install NetData # FIXME: Allow unsigned packages (for now) #7773 zypper install -y --allow-unsigned-rpm \ - /artifacts/netdata-"${pkg_version}"-*.rpm + /packages/netdata-"${pkg_version}"-*.rpm # Install testing tools zypper install -y --no-recommends \ diff --git a/packaging/scripts/test.sh b/packaging/scripts/test.sh index d33bcc2438..bae664d334 100755 --- a/packaging/scripts/test.sh +++ b/packaging/scripts/test.sh @@ -39,3 +39,5 @@ cat ./response jq '.version' ./response || exit 1 trap - EXIT + +cp -a /packages/* /artifacts |