From 8f907bf767dd92b5cfc2be0e324e484d8ff051ff Mon Sep 17 00:00:00 2001 From: Spencer Gilbert Date: Mon, 29 Apr 2024 18:37:42 +0200 Subject: [PATCH] test: Install dd-pkg in *-verify workflows and lint in verify-install.sh (#20397) Signed-off-by: Spencer Gilbert --- .github/workflows/publish.yml | 8 ++++++++ scripts/verify-install.sh | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d07b7a223ba2c..a2ddd463bd0a9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -347,6 +347,7 @@ jobs: - build-x86_64-unknown-linux-gnu-packages env: VECTOR_VERSION: ${{ needs.generate-publish-metadata.outputs.vector_version }} + DD_PKG_VERSION: "latest" strategy: matrix: container: @@ -369,6 +370,9 @@ jobs: git \ systemd \ make + - name: Install dd-pkg for linting + run: | + curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_x86_64.tar.gz" | tar -xz -C /usr/local/bin dd-pkg - name: Fix Git safe directories issue when in containers (actions/checkout#760) run: git config --global --add safe.directory /__w/vector/vector - name: Checkout Vector @@ -393,6 +397,7 @@ jobs: - build-x86_64-unknown-linux-gnu-packages env: VECTOR_VERSION: ${{ needs.generate-publish-metadata.outputs.vector_version }} + DD_PKG_VERSION: "latest" strategy: matrix: container: @@ -419,6 +424,9 @@ jobs: if ! command -v curl &> /dev/null ; then yum install -y curl fi + - name: Install dd-pkg for linting + run: | + curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_x86_64.tar.gz" | tar -xz -C /usr/local/bin dd-pkg - name: Fix Git safe directories issue when in containers (actions/checkout#760) run: git config --global --add safe.directory /__w/vector/vector - name: Checkout Vector diff --git a/scripts/verify-install.sh b/scripts/verify-install.sh index 48e80ee36ffa0..a73dccc7a52b4 100755 --- a/scripts/verify-install.sh +++ b/scripts/verify-install.sh @@ -5,7 +5,7 @@ set -euo pipefail # # SUMMARY # -# Verifies vector packages have been installed correctly +# Verifies vector packages have been built and installed correctly package="${1:?must pass package as argument}" @@ -38,3 +38,5 @@ getent group vector || (echo "vector group missing" && exit 1) vector --version || (echo "vector --version failed" && exit 1) grep -q "FOO=bar" "/etc/default/vector" || (echo "/etc/default/vector has incorrect contents" && exit 1) grep -q "foo: bar" "/etc/vector/vector.yaml" || (echo "/etc/vector/vector.yaml has incorrect contents" && exit 1) + +dd-pkg lint "$package"