Merge pull request #384 from nmburgan/new_main_yay

(RE-16581) Make main PE 2025
voxpupuli · Sep 10, 2024 · 9045087 · 9045087
2 parents c7a3dbe + d4abb0d
commit 9045087
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
@@ -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

diff --git a/spec/beaker-hostgenerator/generator_spec.rb b/spec/beaker-hostgenerator/generator_spec.rb
@@ -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