diff options
author | John McCrae <john.mccrae@progress.com> | 2022-09-22 21:00:19 +0600 |
---|---|---|
committer | Marc A. Paradise <marc.paradise@gmail.com> | 2022-09-28 11:17:17 -0400 |
commit | f0b21e1a7b96a9b4600a65c6a7d44ad90f04f824 (patch) | |
tree | aa06364f56291a83235b20f9acd5955332f1993d | |
parent | dd982bc5014498fe21b03de5d41f881f7a2bbcdb (diff) | |
download | chef-f0b21e1a7b96a9b4600a65c6a7d44ad90f04f824.tar.gz |
Add platform output to verification pipeline scripts
Lets us see in the logs that the OS is the one we think we're
testing/building on.
Signed-off-by: John McCrae <john.mccrae@progress.com>
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
-rwxr-xr-x | .expeditor/scripts/bk_container_prep.sh | 3 | ||||
-rwxr-xr-x | .expeditor/scripts/bk_linux_exec.sh | 4 | ||||
-rw-r--r-- | .expeditor/scripts/bk_win_functional.ps1 | 3 | ||||
-rw-r--r-- | .expeditor/scripts/bk_win_integration.ps1 | 5 | ||||
-rw-r--r-- | .expeditor/scripts/bk_win_unit.ps1 | 3 | ||||
-rw-r--r-- | .expeditor/scripts/verify-plan.ps1 | 3 | ||||
-rwxr-xr-x | .expeditor/scripts/verify-plan.sh | 4 |
7 files changed, 24 insertions, 1 deletions
diff --git a/.expeditor/scripts/bk_container_prep.sh b/.expeditor/scripts/bk_container_prep.sh index e065f20579..4b7299cc5a 100755 --- a/.expeditor/scripts/bk_container_prep.sh +++ b/.expeditor/scripts/bk_container_prep.sh @@ -10,6 +10,9 @@ ruby -v echo "bundler version:" bundle -v +echo "OS version:" +uname -a + echo "--- Preparing Container..." export FORCE_FFI_YAJL="ext" diff --git a/.expeditor/scripts/bk_linux_exec.sh b/.expeditor/scripts/bk_linux_exec.sh index 95848fd578..4fed08b499 100755 --- a/.expeditor/scripts/bk_linux_exec.sh +++ b/.expeditor/scripts/bk_linux_exec.sh @@ -29,6 +29,10 @@ export BUNDLE_GEMFILE=$PWD/kitchen-tests/Gemfile export FORCE_FFI_YAJL=ext export CHEF_LICENSE="accept-silent" +# what OS is this REALLY? +echo "--- Verifying OS" +uname -a + # Update Gems echo "--- Installing Gems" echo 'gem: --no-document' >> ~/.gemrc diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1 index 7d23d07b8f..762ca6e7cf 100644 --- a/.expeditor/scripts/bk_win_functional.ps1 +++ b/.expeditor/scripts/bk_win_functional.ps1 @@ -19,6 +19,9 @@ if (-not $?) { throw "Can't run Ruby. Is it installed?" } Write-Output "--- configure winrm" winrm quickconfig -q +Write-Output "--- Verifying the Windows version we're running on" +Write-Output (Get-WMIObject win32_operatingsystem).name + Write-Output "--- bundle install" bundle config set --local without 'omnibus_package' bundle install --jobs=3 --retry=3 diff --git a/.expeditor/scripts/bk_win_integration.ps1 b/.expeditor/scripts/bk_win_integration.ps1 index 7a2d99ecc8..311feb403c 100644 --- a/.expeditor/scripts/bk_win_integration.ps1 +++ b/.expeditor/scripts/bk_win_integration.ps1 @@ -6,6 +6,9 @@ Set-Item -Path Env:Path -Value ("C:\Program Files\Git\mingw64\bin;C:\Program Fil winrm quickconfig -q -echo "+++ bundle exec rake spec:integration" +Write-Output "--- Verifying the Windows version we're running on" +Write-Output (Get-WMIObject win32_operatingsystem).name + +Write-Output "+++ bundle exec rake spec:integration" bundle exec rake spec:integration if (-not $?) { throw "Chef integration specs failing." } diff --git a/.expeditor/scripts/bk_win_unit.ps1 b/.expeditor/scripts/bk_win_unit.ps1 index f1f28ade05..d0a20442b4 100644 --- a/.expeditor/scripts/bk_win_unit.ps1 +++ b/.expeditor/scripts/bk_win_unit.ps1 @@ -2,6 +2,9 @@ $CurrentDirectory = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent $PrepScript = Join-Path $CurrentDirectory "bk_win_prep.ps1" Invoke-Expression $PrepScript +Write-Output "--- Verifying the Windows version we're running on" +Write-Output (Get-WMIObject win32_operatingsystem).name + echo "+++ bundle exec rake" bundle exec rake spec:unit if (-not $?) { throw "Chef unit tests failing." } diff --git a/.expeditor/scripts/verify-plan.ps1 b/.expeditor/scripts/verify-plan.ps1 index 6fbef95442..5b7fd624f6 100644 --- a/.expeditor/scripts/verify-plan.ps1 +++ b/.expeditor/scripts/verify-plan.ps1 @@ -25,6 +25,9 @@ if (-not ($source.name -match "git.exe")) { $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") } +Write-Output "--- :construction: Verifying the Windows version we're running on" +Write-Output (Get-WMIObject win32_operatingsystem).name + Write-Host "--- :key: Generating fake origin key" hab origin key generate $env:HAB_ORIGIN diff --git a/.expeditor/scripts/verify-plan.sh b/.expeditor/scripts/verify-plan.sh index b207334267..67f16b8697 100755 --- a/.expeditor/scripts/verify-plan.sh +++ b/.expeditor/scripts/verify-plan.sh @@ -17,6 +17,10 @@ error () { exit 1 } +# what OS is this REALLY? +echo "--- :construction: Verifying OS" +uname -a + echo "--- :8ball: :linux: Verifying $PLAN" project_root="$(git rev-parse --show-toplevel)" |