From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 807589CDB3 for ; Thu, 1 Jun 2023 18:15:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 63EA020E4C for ; Thu, 1 Jun 2023 18:14:45 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 1 Jun 2023 18:14:43 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 693964827E for ; Thu, 1 Jun 2023 18:14:43 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 1 Jun 2023 18:14:36 +0200 Message-Id: <20230601161439.114525-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.049 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH proxmox 1/4] apt: drop older Ceph standard repositories X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jun 2023 16:15:15 -0000 On Proxmox VE 8, only Quincy and newer will be supported. Signed-off-by: Fiona Ebner --- 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 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