From 0265026fc8e9a507d0cfbbfa924b123e2ffbd1fb Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 23 Mar 2023 21:41:01 +0900
Subject: [PATCH] Update release to antelope

This switches the default release to antelope as we are close to
create our antelope releases.

Change-Id: Idfc74b71c6255ec79508ed62a0df941655a74424
---
 manifests/repo/debian/params.pp                    |  2 +-
 manifests/repo/redhat/params.pp                    |  2 +-
 .../openstack_extras_repo_debian_debian_spec.rb    | 14 +++++++-------
 .../openstack_extras_repo_debian_ubuntu_spec.rb    |  6 +++---
 .../openstack_extras_repo_redhat_redhat_spec.rb    |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/manifests/repo/debian/params.pp b/manifests/repo/debian/params.pp
index 9a32753..335dda1 100644
--- a/manifests/repo/debian/params.pp
+++ b/manifests/repo/debian/params.pp
@@ -4,7 +4,7 @@
 #
 class openstack_extras::repo::debian::params
 {
-  $release               = 'zed'
+  $release               = 'antelope'
 
   $uca_name              = 'ubuntu-cloud-archive'
   $uca_location          = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'
diff --git a/manifests/repo/redhat/params.pp b/manifests/repo/redhat/params.pp
index 1f67403..c9699b7 100644
--- a/manifests/repo/redhat/params.pp
+++ b/manifests/repo/redhat/params.pp
@@ -4,7 +4,7 @@
 # OS family repo classes.
 #
 class openstack_extras::repo::redhat::params {
-  $release = 'zed'
+  $release = 'antelope'
 
   $centos_mirror_url = 'http://mirror.stream.centos.org'
 
diff --git a/spec/classes/openstack_extras_repo_debian_debian_spec.rb b/spec/classes/openstack_extras_repo_debian_debian_spec.rb
index 0a07bf7..ec23061 100644
--- a/spec/classes/openstack_extras_repo_debian_debian_spec.rb
+++ b/spec/classes/openstack_extras_repo_debian_debian_spec.rb
@@ -14,7 +14,7 @@ describe 'openstack_extras::repo::debian::debian' do
 
     let :paramclass_defaults do
       {
-        :release => 'zed'
+        :release => 'antelope'
       }
     end
 
@@ -23,11 +23,11 @@ describe 'openstack_extras::repo::debian::debian' do
     end
 
     context 'with default params' do
-      it { should contain_exec('/usr/bin/extrepo enable openstack_zed').with(
+      it { should contain_exec('/usr/bin/extrepo enable openstack_antelope').with(
         :command => "/bin/true # comment to satisfy puppet syntax requirements
 apt-get update
 apt-get install -y extrepo
-extrepo enable openstack_zed
+extrepo enable openstack_antelope
 apt-get update
 ",
       )}
@@ -58,14 +58,14 @@ apt-get update
       end
 
       it { should contain_apt__source('debian-openstack-backports').with(
-        :location => 'http://bullseye-zed.debian.net/debian',
-        :release  => 'bullseye-zed-backports',
+        :location => 'http://bullseye-antelope.debian.net/debian',
+        :release  => 'bullseye-antelope-backports',
         :repos    => 'main',
       )}
 
       it { should contain_apt__source('debian-openstack-backports-nochange').with(
-        :location => 'http://bullseye-zed.debian.net/debian',
-        :release  => 'bullseye-zed-backports-nochange',
+        :location => 'http://bullseye-antelope.debian.net/debian',
+        :release  => 'bullseye-antelope-backports-nochange',
         :repos    => 'main'
       )}
 
diff --git a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
index df82ce3..b0dd27a 100644
--- a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
+++ b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
@@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
     let :paramclass_defaults do
       {
-        :release => 'zed'
+        :release => 'antelope'
       }
     end
 
@@ -28,7 +28,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
       it { should contain_apt__source('ubuntu-cloud-archive').with(
         :location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
-        :release  => 'jammy-updates/zed',
+        :release  => 'jammy-updates/antelope',
         :repos    => 'main',
       )}
 
@@ -127,7 +127,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
       it { should contain_apt__source('ubuntu-cloud-archive').with(
         :location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive',
-        :release  => 'jammy-proposed/zed',
+        :release  => 'jammy-proposed/antelope',
         :repos    => 'main',
       )}
     end
diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
index 726cf04..a6cfe19 100644
--- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
+++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
@@ -13,8 +13,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
         :before => 'Anchor[openstack_extras_redhat]',
       )}
       it { should contain_yumrepo('rdo-release').with(
-        :baseurl         => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-zed/",
-        :descr           => "OpenStack Zed Repository",
+        :baseurl         => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-antelope/",
+        :descr           => "OpenStack Antelope Repository",
         :gpgkey          => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
         :enabled         => '1',
         :gpgcheck        => '1',
@@ -120,7 +120,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { should contain_yumrepo('rdo-release').with(
-        :baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-zed/",
+        :baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-antelope/",
       )}
     end