public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Michael Köppl" <m.koeppl@proxmox.com>
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	[thread overview]
Message-ID: <20261104190345.2573464-31-m.koeppl@proxmox.com> (raw)
In-Reply-To: <20261104190345.2573464-1-m.koeppl@proxmox.com>

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 <m.koeppl@proxmox.com>
---
 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





  parent reply	other threads:[~2026-11-04 19:07 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-04 19:03 [PATCH e2e-tests/test-tools 00/38] tests: add tests for guests, Ceph, PBS and cluster workflows Michael Köppl
2026-11-04 19:03 ` [PATCH test-tools 01/38] ansible: rename snd_test bridge to tt_test as multi-purpose bridge Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 02/38] plans: rename sdn_test bridge to tt_test Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 03/38] debian: add missing jq dependency Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 04/38] test framework: move the default container template to the helper Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 05/38] lib: instance: add helper to check if an address answers ping Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 06/38] lib: pveinstance: look up disks by their SCSI serial Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 07/38] lib: pveinstance: add helper to find a task started by another task Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 08/38] lib: pveinstance: add helpers to start and stop guests Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 09/38] lib: pveinstance: add helper to run commands in containers Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 10/38] lib: pveinstance: add helper to wait for qmeventd's cleanup Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 11/38] lib: pveinstance: add helper to check if guest exists Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 12/38] lib: add helpers to use a PBS datastore as PVE storage Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 13/38] scripts: retry container template download, fail if it fails Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 14/38] tests: container: verify lifecycle and guest setup Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 15/38] tests: container: verify volume and bind mountpoints Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 16/38] tests: container: verify snapshots, clones, templates Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 17/38] tests: container: verify device passthrough Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 18/38] plans,scripts: build a minimal OCI image onto pve1 Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 19/38] tests: container: verify application containers from OCI images Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 20/38] tests: vm: verify snapshots, clones, templates Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 21/38] tests: vm: verify adding, resizing, and removing disks Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 22/38] plans,scripts: download a Debian cloud image onto pve1 Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 23/38] tests: vm: verify lifecycle operations and cloud-init guest setup Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 24/38] plans,scripts: install Ceph Tentacle on the cluster nodes Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 25/38] test framework: add Ceph test helpers Michael Köppl
2026-11-06 12:24   ` Kefu Chai
2026-11-06 13:04     ` Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 26/38] tests: ceph: verify setting up a hyper-converged cluster Michael Köppl
2026-11-06 12:50   ` Kefu Chai
2026-11-06 13:05     ` Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 27/38] tests: ceph: verify guests on RBD storage Michael Köppl
2026-11-06 13:01   ` Kefu Chai
2026-11-06 13:07     ` Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 28/38] tests: ceph: verify setting up, using and destroying a CephFS Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 29/38] tests: ceph: verify replacing an OSD Michael Köppl
2026-11-06 13:14   ` Kefu Chai
2026-11-04 19:03 ` Michael Köppl [this message]
2026-11-04 19:03 ` [PATCH e2e-tests 31/38] tests: pbs: verify container backup and restore Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 32/38] tests: backup: verify VM backup and restore, locally and on PBS Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 33/38] tests: pbs: verify single file restore from a container backup Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 34/38] tests: storage: verify moving guest volumes between storages Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 35/38] tests: migration: verify container migration between nodes Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 36/38] tests: migration: verify VM migration with local disks Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 37/38] tests: ha: verify moving guests off a node for maintenance Michael Köppl
2026-11-04 19:03 ` [PATCH e2e-tests 38/38] tests: migration: verify migrating guests in bulk Michael Köppl
2026-11-06 13:25 ` [PATCH e2e-tests/test-tools 00/38] tests: add tests for guests, Ceph, PBS and cluster workflows Kefu Chai

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=20261104190345.2573464-31-m.koeppl@proxmox.com \
    --to=m.koeppl@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal