From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 817301FF0C0 for ; Wed, 04 Nov 2026 20:07:18 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id ADA1021891; Wed, 04 Nov 2026 20:05:25 +0100 (CET) From: =?UTF-8?q?Michael=20K=C3=B6ppl?= To: pve-devel@lists.proxmox.com Subject: [PATCH e2e-tests 30/38] tests: ceph: drop the outdated Ceph setup Date: Wed, 4 Nov 2026 20:03:37 +0100 Message-ID: <20261104190345.2573464-31-m.koeppl@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261104190345.2573464-1-m.koeppl@proxmox.com> References: <20261104190345.2573464-1-m.koeppl@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793819036229 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.219 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: EMRXZQM5UXHY3WMWLE6ANYFJXWO7YD55 X-Message-ID-Hash: EMRXZQM5UXHY3WMWLE6ANYFJXWO7YD55 X-MailFrom: m.koeppl@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The Ceph plan uses an old plan format, its instance names do not match the ones the test cases expect, and the runner script refers to a setup file that does not exist, so these test cases no longer run. The Ceph tests on the main cluster replace them. Signed-off-by: Michael Köppl --- debian/proxmox-e2e-tests-scripts.install | 1 - plans/ceph.ron | 87 ------------------------ run_ceph_tests.sh | 10 --- tests/ceph_testcases.ron | 29 -------- tests/create_ceph_cluster.pl | 69 ------------------- tests/test_create_cluster.pl | 46 ------------- 6 files changed, 242 deletions(-) delete mode 100644 plans/ceph.ron delete mode 100755 run_ceph_tests.sh delete mode 100644 tests/ceph_testcases.ron delete mode 100755 tests/create_ceph_cluster.pl delete mode 100755 tests/test_create_cluster.pl diff --git a/debian/proxmox-e2e-tests-scripts.install b/debian/proxmox-e2e-tests-scripts.install index 63f3521..42d1e98 100644 --- a/debian/proxmox-e2e-tests-scripts.install +++ b/debian/proxmox-e2e-tests-scripts.install @@ -1,4 +1,3 @@ run_tests.sh /usr/bin/proxmox-e2e-tests/ run_tests_local.sh /usr/bin/proxmox-e2e-tests/ -run_ceph_tests.sh /usr/bin/proxmox-e2e-tests/ run_ldap.sh /usr/bin/proxmox-e2e-tests/ diff --git a/plans/ceph.ron b/plans/ceph.ron deleted file mode 100644 index e57d7c6..0000000 --- a/plans/ceph.ron +++ /dev/null @@ -1,87 +0,0 @@ -#![enable(implicit_some)] - -[ - SetupInstance( - name: "pve1", - install: ( - fqdn: "pve1.proxmox.com", - iso: "local:iso/proxmox-ve_8.2-2-auto-from-http-url.iso", - cores: 2, - memory: 3000, - disk_setup: Xfs( - size: 10, - ), - root_password: Ref("default"), - additional_disks: [ - Disk( - serial: "ceph0", - size: 10, - ), - Disk( - serial: "ceph1", - size: 10, - ), - ] - ), - post_setup: [ - "scripts/update-packages.sh pve staging", - ], - - ), - SetupInstance( - name: "pve2", - install: ( - fqdn: "pve2.proxmox.com", - iso: "local:iso/proxmox-ve_8.2-2-auto-from-http-url.iso", - cores: 2, - memory: 3000, - disk_setup: Ext4( - size: 10, - ), - root_password: Ref("default"), - additional_disks: [ - Disk( - serial: "ceph0", - size: 10, - ), - Disk( - serial: "ceph1", - size: 10, - ), - ] - ), - post_setup: [ - "scripts/update-packages.sh pve staging", - ], - - ), - SetupInstance( - name: "pve3", - install: ( - fqdn: "pve3.proxmox.com", - iso: "local:iso/proxmox-ve_8.2-2-auto-from-http-url.iso", - cores: 2, - memory: 3000, - disk_setup: Zfs( - size: 10, - raid: Raid1, - ), - root_password: Ref("default"), - additional_disks: [ - Disk( - serial: "ceph0", - size: 10, - ), - Disk( - serial: "ceph1", - size: 10, - ), - ] - ), - post_setup: [ - "scripts/update-packages.sh pve staging", - ], - - ), -] - diff --git a/run_ceph_tests.sh b/run_ceph_tests.sh deleted file mode 100755 index f80d768..0000000 --- a/run_ceph_tests.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/bash -set -e - -inventory="inventory_ceph.ron" - -proxmox-test-instance setup setups/ceph.ron --output $inventory -#proxmox-test-instance rollback $inventory post-setup -proxmox-test-runner run $inventory tests/ceph_testcases.ron -proxmox-test-instance cleanup $inventory - diff --git a/tests/ceph_testcases.ron b/tests/ceph_testcases.ron deleted file mode 100644 index b8894bc..0000000 --- a/tests/ceph_testcases.ron +++ /dev/null @@ -1,29 +0,0 @@ -#![enable(implicit_some)] - -TestcaseConfig( - testcases: [ - Testcase( - name: "test_create_cluster", - run: "./tests/test_create_cluster.pl", - // There are some sleeps in the test case - timeout: 60, - instances: [ - "pve-ceph-1", - "pve-ceph-2", - "pve-ceph-3", - ], - ), - Testcase( - name: "test_create_ceph_cluster", - run: "./tests/create_ceph_cluster.pl", - // There are some sleeps in the test case - timeout: 600, - instances: [ - "pve-ceph-1", - "pve-ceph-2", - "pve-ceph-3", - ], - ), - ], - rollback_between_tests: Some("pre-test"), -) diff --git a/tests/create_ceph_cluster.pl b/tests/create_ceph_cluster.pl deleted file mode 100755 index 434afe2..0000000 --- a/tests/create_ceph_cluster.pl +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/perl -use strict; -use warnings; -use JSON; -use File::Slurp; - -use lib '.'; -use Proxmox::Test::Helper qw(get_pve_instances); - -use Data::Dumper; - -use Test::More; - -my $instances = get_pve_instances(); - -for my $instance ($instances->@*) { - # Make sure that we are in sync - $instance->run_command("systemctl restart chrony"); - $instance->run_command("yes | pveceph install -version squid -repository no-subscription"); -} - -## Init ceph -for my $instance ($instances->@*) { - my $nodename = $instance->get_nodename(); - $instance->client()->post("/nodes/$nodename/ceph/init", {}); -} - -# Create monitors -for my $instance ($instances->@*) { - my $nodename = $instance->get_nodename(); - my $upid = $instance->client()->post("/nodes/$nodename/ceph/mon/$nodename", {}); - - is($instance->wait_for_task($upid), "OK", "monitor created on '$nodename'"); - - # TODO: Can we avoid this? Something seems to be a bit racy here if we don't wait a bit - sleep(3); -} - -# Create OSDs -for my $instance ($instances->@*) { - my $nodename = $instance->get_nodename(); - - for my $disk ($instance->get_additional_disks()->@*) { - my $serial = $disk->{serial}; - my $path = $instance->get_disk_by_serial($serial); - - my $upid = $instance->client()->post("/nodes/$nodename/ceph/osd", { - dev => $path, - }); - - is( - $instance->wait_for_task($upid), - "OK", - "OSD created on '$nodename' for disk with serial '$serial'", - ); - } -} - -# Create pool -my $instance = $instances->[0]; -my $nodename = $instance->get_nodename(); - -my $upid = $instance->client()->post("/nodes/$nodename/ceph/pool", { - name => "testpool", -}); - -is($instance->wait_for_task($upid), "OK", "'testpool' created"); - -done_testing(); diff --git a/tests/test_create_cluster.pl b/tests/test_create_cluster.pl deleted file mode 100755 index 64a80e1..0000000 --- a/tests/test_create_cluster.pl +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/perl -use strict; -use warnings; - -use Test::More; - -use lib '.'; -use Proxmox::Test::Helper qw(get_pve_instances); -use Data::Dumper; - -my $pve_instances = get_pve_instances(); - -my $first = splice(@$pve_instances, 0, 1); - -if (scalar($pve_instances->@*) < 1) { - die "not enough instances"; -} - -my $upid; -$upid = $first->client()->post('/cluster/config', { - clustername => 'test', -}); - -is($first->wait_for_task($upid), "OK", "created the cluster"); - -for my $instance (@$pve_instances) { - $upid = $instance->client->post( - '/cluster/config/join', - { - hostname => $first->get_ip(), - password => $first->get_root_password(), - fingerprint => $first->get_fingerprint(), - }, - ); - - is($instance->wait_for_task($upid), "OK", "joined the cluster"); -} - -my $cluster_nodes = $first->client()->get("/cluster/config/nodes"); - -my @members = sort map $_->{name}, $cluster_nodes->@*; -my @nodenames = sort map $_->get_nodename(), get_pve_instances()->@*; -is_deeply(\@members, \@nodenames, "all instances are member of the cluster"); - -done_testing(); - -- 2.47.3