diff options
| author | Nathaniel Kierpiec <nkierpiec@chef.io> | 2021-04-16 10:27:22 -0400 |
|---|---|---|
| committer | Nathaniel Kierpiec <nkierpiec@chef.io> | 2021-04-16 10:27:22 -0400 |
| commit | 1eef14ded1e352bd4d856200e1f1b06920332400 (patch) | |
| tree | 780795b2e9921e1e1a02539d6ce7640d6c7ebe66 /omnibus | |
| parent | a9fca53d7cadb6af883933f06ba7f2ab4898f92e (diff) | |
| download | chef-1eef14ded1e352bd4d856200e1f1b06920332400.tar.gz | |
Update tests to handle local omnibus packages from Buildkite artifacts apinkierpiec/update-omnibus-tests-chef-16
Signed-off-by: Nathaniel Kierpiec <nkierpiec@chef.io>
Diffstat (limited to 'omnibus')
| -rw-r--r-- | omnibus/omnibus-test.ps1 | 13 | ||||
| -rw-r--r-- | omnibus/omnibus-test.sh | 7 |
2 files changed, 17 insertions, 3 deletions
diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1 index aa23a6442a..8e083d3d71 100644 --- a/omnibus/omnibus-test.ps1 +++ b/omnibus/omnibus-test.ps1 @@ -20,8 +20,17 @@ If ([string]::IsNullOrEmpty($product)) { $product = "chef" } $version = "$Env:VERSION" If ([string]::IsNullOrEmpty($version)) { $version = "latest" } -Write-Output "--- Installing $channel $product $version" -$package_file = $(C:\opscode\omnibus-toolchain\bin\install-omnibus-product.ps1 -Product "$product" -Channel "$channel" -Version "$version" | Select-Object -Last 1) +$package_file = "$Env:PACKAGE_FILE" +If ([string]::IsNullOrEmpty($package_file)) { $package_file = "" } + +If ($package_file -eq "") { + Write-Output "--- Installing $channel $product $version" + $package_file = $(.omnibus-buildkite-plugin\install-omnibus-product.ps1 -Product "$product" -Channel "$channel" -Version "$version" | Select-Object -Last 1) +} +Else { + Write-Output "--- Installing $product $version" + $package_file = $(.omnibus-buildkite-plugin\install-omnibus-product.ps1 -Package "$package_file" -Product "$product" -Version "$version" | Select-Object -Last 1) +} Write-Output "--- Verifying omnibus package is signed" C:\opscode\omnibus-toolchain\bin\check-omnibus-package-signed.ps1 "$package_file" diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh index 2c1313681c..2a32288253 100644 --- a/omnibus/omnibus-test.sh +++ b/omnibus/omnibus-test.sh @@ -4,11 +4,16 @@ set -ueo pipefail channel="${CHANNEL:-unstable}" product="${PRODUCT:-chef}" version="${VERSION:-latest}" +package_file=${PACKAGE_FILE:-""} export INSTALL_DIR="/opt/$product" echo "--- Installing $channel $product $version" -package_file="$("/opt/$TOOLCHAIN/bin/install-omnibus-product" -c "$channel" -P "$product" -v "$version" | tail -1)" +if [[ -z $package_file ]]; then + package_file="$(.omnibus-buildkite-plugin/install-omnibus-product.sh -c "$channel" -P "$product" -v "$version" | tail -1)" +else + .omnibus-buildkite-plugin/install-omnibus-product.sh -f "$package_file" -P "$product" -v "$version" &> /dev/null +fi echo "--- Verifying omnibus package is signed" "/opt/$TOOLCHAIN/bin/check-omnibus-package-signed" "$package_file" |