diff options
author | John McCrae <john.mccrae@progress.com> | 2022-06-29 07:18:28 -0700 |
---|---|---|
committer | Thomas Powell <powell@progress.com> | 2022-08-23 11:08:51 -0400 |
commit | 2f5dbd1ee69c970fc06870477dbbca6c5c3555c4 (patch) | |
tree | de0dcdb7b443306b000d71f70d54bb08ff2d2e6f /.expeditor | |
parent | 964236952f9fad2398a6a3a2501774e430b17b6d (diff) | |
download | chef-2f5dbd1ee69c970fc06870477dbbca6c5c3555c4.tar.gz |
Integrate ruby 3.1 into builds
This is a combination of 64 commits, the originals were mostly
repeating one-line messages so that history has not been kept here.
Signed-off-by: Thomas Powell <thomas.powell@progress.com>
Signed-off-by: Marc Paradise <marc@chef.io>
Signed-off-by: John McCrae <john.mccrae@progress.com>
Diffstat (limited to '.expeditor')
-rw-r--r-- | .expeditor/adhoc-canary.omnibus.yml | 2 | ||||
-rw-r--r-- | .expeditor/release.omnibus.yml | 3 | ||||
-rw-r--r-- | .expeditor/scripts/bk_win_functional.ps1 | 8 | ||||
-rw-r--r-- | .expeditor/scripts/ensure-minimum-viable-hab.ps1 | 3 | ||||
-rw-r--r-- | .expeditor/scripts/verify-plan.ps1 | 10 | ||||
-rw-r--r-- | .expeditor/verify.pipeline.yml | 44 |
6 files changed, 24 insertions, 46 deletions
diff --git a/.expeditor/adhoc-canary.omnibus.yml b/.expeditor/adhoc-canary.omnibus.yml index 10617b5989..a8594ea664 100644 --- a/.expeditor/adhoc-canary.omnibus.yml +++ b/.expeditor/adhoc-canary.omnibus.yml @@ -80,8 +80,6 @@ builder-to-testers-map: - ubuntu-18.04-x86_64 - ubuntu-20.04-x86_64 - ubuntu-22.04-x86_64 - windows-2012r2-i386: - - windows-2012r2-i386 windows-2012r2-x86_64: - windows-2012-x86_64 - windows-2012r2-x86_64 diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index 1a2b43ea60..98cc101e11 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -10,6 +10,7 @@ fips-platforms: - windows-* skip-artifactory-platforms: - freebsd-13-amd64 +windows-64-msystem: UCRT64 builder-to-testers-map: aix-7.1-powerpc: - aix-7.1-powerpc @@ -80,8 +81,6 @@ builder-to-testers-map: - ubuntu-18.04-x86_64 - ubuntu-20.04-x86_64 - ubuntu-22.04-x86_64 - windows-2012r2-i386: - - windows-2012r2-i386 windows-2012r2-x86_64: - windows-2012-x86_64 - windows-2012r2-x86_64 diff --git a/.expeditor/scripts/bk_win_functional.ps1 b/.expeditor/scripts/bk_win_functional.ps1 index 8b4a445b44..7d23d07b8f 100644 --- a/.expeditor/scripts/bk_win_functional.ps1 +++ b/.expeditor/scripts/bk_win_functional.ps1 @@ -7,11 +7,11 @@ Remove-Item -Path C:\ProgramData\chocolatey\bin\choco.exe -ErrorAction SilentlyC $ErrorActionPreference = 'Stop' -Write-Output "--- Enable Ruby 2.7" +Write-Output "--- Enable Ruby 3.1" -Write-Output "Register Installed Ruby Version 2.7 With Uru" -Start-Process "uru_rt.exe" -ArgumentList 'admin add C:\ruby27\bin' -Wait -uru 271 +Write-Output "Register Installed Ruby Version 3.1 With Uru" +Start-Process "uru_rt.exe" -ArgumentList 'admin add C:\ruby31\bin' -Wait +uru 312 if (-not $?) { throw "Can't Activate Ruby. Did Uru Registration Succeed?" } ruby -v if (-not $?) { throw "Can't run Ruby. Is it installed?" } diff --git a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 b/.expeditor/scripts/ensure-minimum-viable-hab.ps1 index 10bfeb0fa8..716de60cf8 100644 --- a/.expeditor/scripts/ensure-minimum-viable-hab.ps1 +++ b/.expeditor/scripts/ensure-minimum-viable-hab.ps1 @@ -1,7 +1,8 @@ [Version]$hab_version = (hab --version).split(" ")[1].split("/")[0] if ($hab_version -lt [Version]"0.85.0" ) { Write-Host "--- :habicat: Installing the version of Habitat required" - install-habitat --version 0.85.0.20190916 + Set-ExecutionPolicy Bypass -Scope Process -Force + Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1')) if (-not $?) { throw "Hab version is older than 0.85 and could not update it." } } else { Write-Host "--- :habicat: :thumbsup: Minimum required version of Habitat already installed" diff --git a/.expeditor/scripts/verify-plan.ps1 b/.expeditor/scripts/verify-plan.ps1 index 614d472964..6fbef95442 100644 --- a/.expeditor/scripts/verify-plan.ps1 +++ b/.expeditor/scripts/verify-plan.ps1 @@ -14,6 +14,16 @@ Write-Host "--- :8ball: :windows: Verifying $Plan" powershell -File "./.expeditor/scripts/ensure-minimum-viable-hab.ps1" if (-not $?) { throw "Could not ensure the minimum hab version required is installed." } +$env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") + +Write-Host "--- :construction: Verifying Git is Installed" +$source = Get-Command -Name Git -Verbose +Write-Host "Which version of Git is installed? - " $source.version +if (-not ($source.name -match "git.exe")) { + choco install git -y + # gotta refresh the path so you can actually use Git now + $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") +} Write-Host "--- :key: Generating fake origin key" hab origin key generate $env:HAB_ORIGIN diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 14b168661f..e8833be063 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -7,41 +7,11 @@ expeditor: retry: automatic: limit: 1 - timeout_in_minutes: 45 + timeout_in_minutes: 60 steps: ######################################################################### - # Tests Ruby 2.6 -######################################################################### - -- label: "chef-utils Unit :ruby: 2.6" - commands: - - /workdir/.expeditor/scripts/bk_container_prep.sh - - cd chef-utils - - bundle config set --local without omnibus_package - - bundle config set --local path 'vendor/bundle' - - bundle install --jobs=3 --retry=3 - - bundle exec rake spec - expeditor: - executor: - docker: - image: rubydistros/ubuntu-18.04:2.6 - -- label: "chef-config Unit :ruby: 2.6" - commands: - - /workdir/.expeditor/scripts/bk_container_prep.sh - - cd chef-config - - bundle config set --local without omnibus_package - - bundle config set --local path 'vendor/bundle' - - bundle install --jobs=3 --retry=3 - - bundle exec rake spec - expeditor: - executor: - docker: - image: rubydistros/ubuntu-18.04:2.6 - -######################################################################### # Tests Ruby 3.1 ######################################################################### @@ -264,7 +234,7 @@ steps: docker: image: rubydistros/almalinux-8:3.1 -- label: "Functional Windows :ruby: 2.7" +- label: "Functional Windows :ruby: 3.1" commands: - .expeditor/scripts/bk_win_functional.ps1 expeditor: @@ -274,27 +244,27 @@ steps: single-use: true shell: ["powershell", "-Command"] -- label: "Integration Windows :ruby: 3.0" +- label: "Integration Windows :ruby: 3.1" commands: - /workdir/.expeditor/scripts/bk_win_integration.ps1 expeditor: executor: docker: host_os: windows - image: rubydistros/windows-2019:3.0 + image: rubydistros/windows-2019:3.1 environment: - FORCE_FFI_YAJL=ext - CHEF_LICENSE=accept-no-persist shell: ["powershell", "-Command"] -- label: "Unit Windows :ruby: 3.0" +- label: "Unit Windows :ruby: 3.1" commands: - /workdir/.expeditor/scripts/bk_win_unit.ps1 expeditor: executor: docker: host_os: windows - image: rubydistros/windows-2019:3.0 + image: rubydistros/windows-2019:3.1 environment: - FORCE_FFI_YAJL=ext - CHEF_LICENSE=accept-no-persist @@ -393,7 +363,7 @@ steps: - label: ":habicat: Windows plan" commands: - ./.expeditor/scripts/verify-plan.ps1 - timeout_in_minutes: 60 + timeout_in_minutes: 0 expeditor: executor: windows: |