From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 proxmox 1/5] apt: drop older Ceph standard repositories
Date: Fri, 2 Jun 2023 10:48:20 +0200 [thread overview]
Message-ID: <20230602084824.54967-1-f.ebner@proxmox.com> (raw)
On Proxmox VE 8, only Quincy and newer will be supported.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
No changes in v2.
Changes for the series in v2:
* create temporary test directories inside CARGO_TARGET_TMPDIR
* mention that deprecated 'main' component maps to no-subscription
in description of the repo.
proxmox-apt/src/repositories/mod.rs | 4 --
proxmox-apt/src/repositories/standard.rs | 58 ------------------------
proxmox-apt/tests/repositories.rs | 4 --
3 files changed, 66 deletions(-)
diff --git a/proxmox-apt/src/repositories/mod.rs b/proxmox-apt/src/repositories/mod.rs
index d8848b8..11f52dd 100644
--- a/proxmox-apt/src/repositories/mod.rs
+++ b/proxmox-apt/src/repositories/mod.rs
@@ -92,10 +92,6 @@ pub fn standard_repositories(
result.append(&mut vec![
APTStandardRepository::from(APTRepositoryHandle::CephQuincy),
APTStandardRepository::from(APTRepositoryHandle::CephQuincyTest),
- APTStandardRepository::from(APTRepositoryHandle::CephPacific),
- APTStandardRepository::from(APTRepositoryHandle::CephPacificTest),
- APTStandardRepository::from(APTRepositoryHandle::CephOctopus),
- APTStandardRepository::from(APTRepositoryHandle::CephOctopusTest),
]);
}
diff --git a/proxmox-apt/src/repositories/standard.rs b/proxmox-apt/src/repositories/standard.rs
index 5af3117..33c4842 100644
--- a/proxmox-apt/src/repositories/standard.rs
+++ b/proxmox-apt/src/repositories/standard.rs
@@ -50,14 +50,6 @@ pub enum APTRepositoryHandle {
CephQuincy,
/// Ceph Quincy test repository.
CephQuincyTest,
- /// Ceph Pacific repository.
- CephPacific,
- /// Ceph Pacific test repository.
- CephPacificTest,
- /// Ceph Octoput repository.
- CephOctopus,
- /// Ceph Octoput test repository.
- CephOctopusTest,
}
impl From<APTRepositoryHandle> for APTStandardRepository {
@@ -81,10 +73,6 @@ impl TryFrom<&str> for APTRepositoryHandle {
"test" => Ok(APTRepositoryHandle::Test),
"ceph-quincy" => Ok(APTRepositoryHandle::CephQuincy),
"ceph-quincy-test" => Ok(APTRepositoryHandle::CephQuincyTest),
- "ceph-pacific" => Ok(APTRepositoryHandle::CephPacific),
- "ceph-pacific-test" => Ok(APTRepositoryHandle::CephPacificTest),
- "ceph-octopus" => Ok(APTRepositoryHandle::CephOctopus),
- "ceph-octopus-test" => Ok(APTRepositoryHandle::CephOctopusTest),
_ => bail!("unknown repository handle '{}'", string),
}
}
@@ -98,10 +86,6 @@ impl Display for APTRepositoryHandle {
APTRepositoryHandle::Test => write!(f, "test"),
APTRepositoryHandle::CephQuincy => write!(f, "ceph-quincy"),
APTRepositoryHandle::CephQuincyTest => write!(f, "ceph-quincy-test"),
- APTRepositoryHandle::CephPacific => write!(f, "ceph-pacific"),
- APTRepositoryHandle::CephPacificTest => write!(f, "ceph-pacific-test"),
- APTRepositoryHandle::CephOctopus => write!(f, "ceph-octopus"),
- APTRepositoryHandle::CephOctopusTest => write!(f, "ceph-octopus-test"),
}
}
}
@@ -130,20 +114,6 @@ impl APTRepositoryHandle {
"This repository contains the Ceph Quincy packages before they are moved to the \
main repository."
}
- APTRepositoryHandle::CephPacific => {
- "This repository holds the main Proxmox Ceph Pacific packages."
- }
- APTRepositoryHandle::CephPacificTest => {
- "This repository contains the Ceph Pacific packages before they are moved to the \
- main repository."
- }
- APTRepositoryHandle::CephOctopus => {
- "This repository holds the main Proxmox Ceph Octopus packages."
- }
- APTRepositoryHandle::CephOctopusTest => {
- "This repository contains the Ceph Octopus packages before they are moved to the \
- main repository."
- }
}
.to_string()
}
@@ -156,10 +126,6 @@ impl APTRepositoryHandle {
APTRepositoryHandle::Test => "Test",
APTRepositoryHandle::CephQuincy => "Ceph Quincy",
APTRepositoryHandle::CephQuincyTest => "Ceph Quincy Test",
- APTRepositoryHandle::CephPacific => "Ceph Pacific",
- APTRepositoryHandle::CephPacificTest => "Ceph Pacific Test",
- APTRepositoryHandle::CephOctopus => "Ceph Octopus",
- APTRepositoryHandle::CephOctopusTest => "Ceph Octopus Test",
}
.to_string()
}
@@ -174,10 +140,6 @@ impl APTRepositoryHandle {
APTRepositoryHandle::Test => "/etc/apt/sources.list".to_string(),
APTRepositoryHandle::CephQuincy => "/etc/apt/sources.list.d/ceph.list".to_string(),
APTRepositoryHandle::CephQuincyTest => "/etc/apt/sources.list.d/ceph.list".to_string(),
- APTRepositoryHandle::CephPacific => "/etc/apt/sources.list.d/ceph.list".to_string(),
- APTRepositoryHandle::CephPacificTest => "/etc/apt/sources.list.d/ceph.list".to_string(),
- APTRepositoryHandle::CephOctopus => "/etc/apt/sources.list.d/ceph.list".to_string(),
- APTRepositoryHandle::CephOctopusTest => "/etc/apt/sources.list.d/ceph.list".to_string(),
}
}
@@ -229,26 +191,6 @@ impl APTRepositoryHandle {
vec!["http://download.proxmox.com/debian/ceph-quincy".to_string()],
"test".to_string(),
),
- APTRepositoryHandle::CephPacific => (
- APTRepositoryPackageType::Deb,
- vec!["http://download.proxmox.com/debian/ceph-pacific".to_string()],
- "main".to_string(),
- ),
- APTRepositoryHandle::CephPacificTest => (
- APTRepositoryPackageType::Deb,
- vec!["http://download.proxmox.com/debian/ceph-pacific".to_string()],
- "test".to_string(),
- ),
- APTRepositoryHandle::CephOctopus => (
- APTRepositoryPackageType::Deb,
- vec!["http://download.proxmox.com/debian/ceph-octopus".to_string()],
- "main".to_string(),
- ),
- APTRepositoryHandle::CephOctopusTest => (
- APTRepositoryPackageType::Deb,
- vec!["http://download.proxmox.com/debian/ceph-octopus".to_string()],
- "test".to_string(),
- ),
}
}
diff --git a/proxmox-apt/tests/repositories.rs b/proxmox-apt/tests/repositories.rs
index 75608b3..ea714e6 100644
--- a/proxmox-apt/tests/repositories.rs
+++ b/proxmox-apt/tests/repositories.rs
@@ -364,10 +364,6 @@ fn test_standard_repositories() -> Result<(), Error> {
APTStandardRepository::from(APTRepositoryHandle::Test),
APTStandardRepository::from(APTRepositoryHandle::CephQuincy),
APTStandardRepository::from(APTRepositoryHandle::CephQuincyTest),
- APTStandardRepository::from(APTRepositoryHandle::CephPacific),
- APTStandardRepository::from(APTRepositoryHandle::CephPacificTest),
- APTStandardRepository::from(APTRepositoryHandle::CephOctopus),
- APTStandardRepository::from(APTRepositoryHandle::CephOctopusTest),
];
let absolute_suite_list = read_dir.join("absolute_suite.list");
--
2.39.2
next reply other threads:[~2023-06-02 8:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 8:48 Fiona Ebner [this message]
2023-06-02 8:48 ` [pve-devel] [PATCH v2 proxmox 2/5] apt: split Ceph main repository into no-subscription and enterprise Fiona Ebner
2023-06-02 8:48 ` [pve-devel] [PATCH v2 proxmox 3/5] apt: tests: create temporary test directories in CARGO_TARGET_TMPDIR Fiona Ebner
2023-06-02 8:48 ` [pve-devel] [PATCH v2 proxmox 4/5] apt: tests: code cleanup to avoid useless vector Fiona Ebner
2023-06-02 8:48 ` [pve-devel] [PATCH v2 proxmox 5/5] apt: tests: add tests for Ceph Quincy repository detection on Bookworm Fiona Ebner
2023-06-04 16:54 ` [pve-devel] applied: [PATCH v2 proxmox 1/5] apt: drop older Ceph standard repositories Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230602084824.54967-1-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox