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 C299B90E20 for ; Tue, 6 Sep 2022 09:39:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B8D032460F for ; Tue, 6 Sep 2022 09:39:33 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 6 Sep 2022 09:39:31 +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 8D47B44EAC for ; Tue, 6 Sep 2022 09:39:31 +0200 (CEST) Date: Tue, 06 Sep 2022 09:39:23 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20220802125927.2341276-1-a.lauterer@proxmox.com> In-Reply-To: <20220802125927.2341276-1-a.lauterer@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1662449952.vxkhhoqo2u.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.160 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, mod.rs, repositories.rs, standard.rs] Subject: [pve-devel] applied: [PATCH] add ceph quincy 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: Tue, 06 Sep 2022 07:39:33 -0000 On August 2, 2022 2:59 pm, Aaron Lauterer wrote: > Signed-off-by: Aaron Lauterer > --- > src/repositories/mod.rs | 2 ++ > src/repositories/standard.rs | 29 +++++++++++++++++++++++++++++ > tests/repositories.rs | 2 ++ > 3 files changed, 33 insertions(+) >=20 > diff --git a/src/repositories/mod.rs b/src/repositories/mod.rs > index 88b515d..d8848b8 100644 > --- a/src/repositories/mod.rs > +++ b/src/repositories/mod.rs > @@ -90,6 +90,8 @@ pub fn standard_repositories( > =20 > if product =3D=3D "pve" { > result.append(&mut vec![ > + APTStandardRepository::from(APTRepositoryHandle::CephQuincy)= , > + APTStandardRepository::from(APTRepositoryHandle::CephQuincyT= est), > APTStandardRepository::from(APTRepositoryHandle::CephPacific= ), > APTStandardRepository::from(APTRepositoryHandle::CephPacific= Test), > APTStandardRepository::from(APTRepositoryHandle::CephOctopus= ), > diff --git a/src/repositories/standard.rs b/src/repositories/standard.rs > index 6b2cafd..17cfa8d 100644 > --- a/src/repositories/standard.rs > +++ b/src/repositories/standard.rs > @@ -46,6 +46,10 @@ pub enum APTRepositoryHandle { > NoSubscription, > /// The test repository. > Test, > + /// Ceph Quincy repository. > + CephQuincy, > + /// Ceph Quincy test repository. > + CephQuincyTest, > /// Ceph Pacific repository. > CephPacific, > /// Ceph Pacific test repository. > @@ -75,6 +79,8 @@ impl TryFrom<&str> for APTRepositoryHandle { > "enterprise" =3D> Ok(APTRepositoryHandle::Enterprise), > "no-subscription" =3D> Ok(APTRepositoryHandle::NoSubscriptio= n), > "test" =3D> Ok(APTRepositoryHandle::Test), > + "ceph-quincy" =3D> Ok(APTRepositoryHandle::CephQuincy), > + "ceph-quincy-test" =3D> Ok(APTRepositoryHandle::CephQuincyTe= st), > "ceph-pacific" =3D> Ok(APTRepositoryHandle::CephPacific), > "ceph-pacific-test" =3D> Ok(APTRepositoryHandle::CephPacific= Test), > "ceph-octopus" =3D> Ok(APTRepositoryHandle::CephOctopus), > @@ -90,6 +96,8 @@ impl Display for APTRepositoryHandle { > APTRepositoryHandle::Enterprise =3D> write!(f, "enterprise")= , > APTRepositoryHandle::NoSubscription =3D> write!(f, "no-subsc= ription"), > APTRepositoryHandle::Test =3D> write!(f, "test"), > + APTRepositoryHandle::CephQuincy =3D> write!(f, "ceph-quincy"= ), > + APTRepositoryHandle::CephQuincyTest =3D> write!(f, "ceph-qui= ncy-test"), > APTRepositoryHandle::CephPacific =3D> write!(f, "ceph-pacifi= c"), > APTRepositoryHandle::CephPacificTest =3D> write!(f, "ceph-pa= cific-test"), > APTRepositoryHandle::CephOctopus =3D> write!(f, "ceph-octopu= s"), > @@ -115,6 +123,13 @@ impl APTRepositoryHandle { > "This repository contains the latest packages and is pri= marily used for test labs \ > and by developers to test new features." > } > + APTRepositoryHandle::CephQuincy =3D> { > + "This repository holds the main Proxmox Ceph Quincy pack= ages." > + } > + APTRepositoryHandle::CephQuincyTest =3D> { > + "This repository contains the Ceph Quincy packages befor= e they are moved to the \ > + main repository." > + } > APTRepositoryHandle::CephPacific =3D> { > "This repository holds the main Proxmox Ceph Pacific pac= kages." > } > @@ -139,6 +154,8 @@ impl APTRepositoryHandle { > APTRepositoryHandle::Enterprise =3D> "Enterprise", > APTRepositoryHandle::NoSubscription =3D> "No-Subscription", > APTRepositoryHandle::Test =3D> "Test", > + APTRepositoryHandle::CephQuincy =3D> "Ceph Quincy", > + APTRepositoryHandle::CephQuincyTest =3D> "Ceph Quincy Test", > APTRepositoryHandle::CephPacific =3D> "Ceph Pacific", > APTRepositoryHandle::CephPacificTest =3D> "Ceph Pacific Test= ", > APTRepositoryHandle::CephOctopus =3D> "Ceph Octopus", > @@ -155,6 +172,8 @@ impl APTRepositoryHandle { > } > APTRepositoryHandle::NoSubscription =3D> "/etc/apt/sources.l= ist".to_string(), > APTRepositoryHandle::Test =3D> "/etc/apt/sources.list".to_st= ring(), > + APTRepositoryHandle::CephQuincy =3D> "/etc/apt/sources.list.= d/ceph.list".to_string(), > + APTRepositoryHandle::CephQuincyTest =3D> "/etc/apt/sources.l= ist.d/ceph.list".to_string(), > APTRepositoryHandle::CephPacific =3D> "/etc/apt/sources.list= .d/ceph.list".to_string(), > APTRepositoryHandle::CephPacificTest =3D> "/etc/apt/sources.= list.d/ceph.list".to_string(), > APTRepositoryHandle::CephOctopus =3D> "/etc/apt/sources.list= .d/ceph.list".to_string(), > @@ -200,6 +219,16 @@ impl APTRepositoryHandle { > }, > format!("{}test", product), > ), > + APTRepositoryHandle::CephQuincy =3D> ( > + APTRepositoryPackageType::Deb, > + vec!["http://download.proxmox.com/debian/ceph-quincy".to= _string()], > + "main".to_string(), > + ), > + APTRepositoryHandle::CephQuincyTest =3D> ( > + APTRepositoryPackageType::Deb, > + vec!["http://download.proxmox.com/debian/ceph-quincy".to= _string()], > + "test".to_string(), > + ), > APTRepositoryHandle::CephPacific =3D> ( > APTRepositoryPackageType::Deb, > vec!["http://download.proxmox.com/debian/ceph-pacific".t= o_string()], > diff --git a/tests/repositories.rs b/tests/repositories.rs > index 70e0201..fd94e0d 100644 > --- a/tests/repositories.rs > +++ b/tests/repositories.rs > @@ -362,6 +362,8 @@ fn test_standard_repositories() -> Result<(), Error> = { > APTStandardRepository::from(APTRepositoryHandle::Enterprise), > APTStandardRepository::from(APTRepositoryHandle::NoSubscription)= , > APTStandardRepository::from(APTRepositoryHandle::Test), > + APTStandardRepository::from(APTRepositoryHandle::CephQuincy), > + APTStandardRepository::from(APTRepositoryHandle::CephQuincyTest)= , > APTStandardRepository::from(APTRepositoryHandle::CephPacific), > APTStandardRepository::from(APTRepositoryHandle::CephPacificTest= ), > APTStandardRepository::from(APTRepositoryHandle::CephOctopus), > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20