Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(RE-16581) Make main PE 2025 #384

Merged
merged 1 commit into from
Sep 10, 2024
Merged

(RE-16581) Make main PE 2025 #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/beaker-hostgenerator/data.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module BeakerHostGenerator
module Data
module_function

MAIN_PE_VERSION = '2023.0'
MAIN_PE_VERSION = '2025.0'
PE_TARBALL_SERVER = 'https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local'

def pe_version
Expand Down
16 changes: 8 additions & 8 deletions spec/beaker-hostgenerator/generator_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,24 +125,24 @@ module BeakerHostGenerator
end
end

context 'pe_dir for versions >= 2021.0' do
let(:dev_version) { '2023.0.0-rc4-11-g123abcd' }
let(:dev_version_no_rc) { '2023.0.0-1-g123abcd' }
let(:pez_version) { '2023.0.0-rc4-11-g123abcd-pez_foo' } # Some jobs use "PEZ" and some "pez"
let(:release_version) { '2023.0.0' }
let(:rc_version) { '2023.0.0-rc4' }
context 'pe_dir for versions >= 2025.0' do
let(:dev_version) { '2025.0.0-rc4-11-g123abcd' }
let(:dev_version_no_rc) { '2025.0.0-1-g123abcd' }
let(:pez_version) { '2025.0.0-rc4-11-g123abcd-pez_foo' } # Some jobs use "PEZ" and some "pez"
let(:release_version) { '2025.0.0' }
let(:rc_version) { '2025.0.0-rc4' }

it 'returns main/ci-ready for a dev version' do
expect(BeakerHostGenerator::Data.pe_dir(dev_version)).to match(%r{main/ci-ready})
expect(BeakerHostGenerator::Data.pe_dir(dev_version_no_rc)).to match(%r{main/ci-ready})
end

it 'returns archives/releases/<version> for a release version' do
expect(BeakerHostGenerator::Data.pe_dir(release_version)).to match(%r{archives/releases/2023\.0\.0})
expect(BeakerHostGenerator::Data.pe_dir(release_version)).to match(%r{archives/releases/2025\.0\.0})
end

it 'returns archives/internal/main for an rc version' do
expect(BeakerHostGenerator::Data.pe_dir(rc_version)).to match(%r{archives/internal/2023.0})
expect(BeakerHostGenerator::Data.pe_dir(rc_version)).to match(%r{archives/internal/2025.0})
end

it 'returns main/feature/ci-ready for a PEZ version' do
Expand Down