From cd0e445527e524a4d34082ebb1ec2ec8d8b1b645 Mon Sep 17 00:00:00 2001
From: Joel Capitao <jcapitao@redhat.com>
Date: Fri, 25 Apr 2025 09:36:13 +0200
Subject: [PATCH] Switch to stable/2025.1 branch

Change-Id: I13f380fb210664d71bcf6ece5de06c8b7063c55b
---
 .gitreview |  1 +
 .zuul.yaml |  8 ++++----
 Puppetfile | 42 +++++++++++++++++++++---------------------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.gitreview b/.gitreview
index 463987619..9bc895533 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=x/packstack.git
+defaultbranch=stable/2025.1
diff --git a/.zuul.yaml b/.zuul.yaml
index 5958c5edb..387b86276 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -35,8 +35,8 @@
     parent: packstack-base
     vars:
       selinux_enforcing: "false"
-      delorean: "https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo"
-      delorean_deps: "https://trunk.rdoproject.org/centos9-master/delorean-deps.repo"
+      delorean: "https://trunk.rdoproject.org/centos9-epoxy/puppet-passed-ci/delorean.repo"
+      delorean_deps: "https://trunk.rdoproject.org/centos9-epoxy/delorean-deps.repo"
     pre-run: playbooks/packstack-centos9-pre.yaml
     nodeset:
       nodes:
@@ -49,8 +49,8 @@
     parent: packstack-base
     vars:
       selinux_enforcing: "false"
-      delorean: "https://trunk.rdoproject.org/centos9-master/puppet-passed-ci/delorean.repo"
-      delorean_deps: "https://trunk.rdoproject.org/centos9-master/delorean-deps.repo"
+      delorean: "https://trunk.rdoproject.org/centos9-epoxy/puppet-passed-ci/delorean.repo"
+      delorean_deps: "https://trunk.rdoproject.org/centos9-epoxy/delorean-deps.repo"
     pre-run: playbooks/packstack-centos9-pre.yaml
     post-run: playbooks/packstack-post-compute.yaml
     nodeset:
diff --git a/Puppetfile b/Puppetfile
index 2a085ec14..4ba676daa 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -6,87 +6,87 @@ moduledir '/usr/share/openstack-puppet/modules'
 
 mod 'aodh',
   :git => 'https://github.com/openstack/puppet-aodh',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'ceilometer',
   :git => 'https://github.com/openstack/puppet-ceilometer',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'cinder',
   :git => 'https://github.com/openstack/puppet-cinder',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'glance',
   :git => 'https://github.com/openstack/puppet-glance',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'gnocchi',
   :git => 'https://github.com/openstack/puppet-gnocchi',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'heat',
   :git => 'https://github.com/openstack/puppet-heat',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'horizon',
   :git => 'https://github.com/openstack/puppet-horizon',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'ironic',
   :git => 'https://github.com/openstack/puppet-ironic',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'keystone',
   :git => 'https://github.com/openstack/puppet-keystone',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'magnum',
   :git => 'https://github.com/openstack/puppet-magnum',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'manila',
   :git => 'https://github.com/openstack/puppet-manila',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'neutron',
   :git => 'https://github.com/openstack/puppet-neutron',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'nova',
   :git => 'https://github.com/openstack/puppet-nova',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'openstacklib',
   :git => 'https://github.com/openstack/puppet-openstacklib',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'oslo',
   :git => 'https://github.com/openstack/puppet-oslo',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'ovn',
   :git => 'https://github.com/openstack/puppet-ovn',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'placement',
   :git => 'https://github.com/openstack/puppet-placement',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'swift',
   :git => 'https://github.com/openstack/puppet-swift',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'tempest',
   :git => 'https://github.com/openstack/puppet-tempest',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'trove',
   :git => 'https://github.com/openstack/puppet-trove',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 mod 'vswitch',
   :git => 'https://github.com/openstack/puppet-vswitch',
-  :ref => 'master'
+  :ref => 'stable/2025.1'
 
 ## Non-OpenStack modules