From ff88d85bc3843f3191901777cd6a75105b9f6db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 6 Oct 2023 09:49:07 -0400 Subject: [PATCH] DEBUG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- shared/cliconfig/remote.go | 1 + test/main.sh | 165 ++----------------------------------- test/suites/clustering.sh | 2 +- 3 files changed, 7 insertions(+), 161 deletions(-) diff --git a/shared/cliconfig/remote.go b/shared/cliconfig/remote.go index 025a70ddbbc..4b7edc3c8c7 100644 --- a/shared/cliconfig/remote.go +++ b/shared/cliconfig/remote.go @@ -94,6 +94,7 @@ func (c *Config) GetInstanceServer(name string) (incus.InstanceServer, error) { unixPath = strings.TrimPrefix(strings.TrimPrefix(remote.Addr, "unix:"), "//") } + fmt.Printf("STGRABER: unixPath=%s\n", unixPath) d, err := incus.ConnectIncusUnix(unixPath, args) if err != nil { return nil, err diff --git a/test/main.sh b/test/main.sh index a4b86fbf23e..5a3a05919c8 100755 --- a/test/main.sh +++ b/test/main.sh @@ -96,6 +96,10 @@ cleanup() { cleanup_incus "$TEST_DIR" fi + if [ "${INCUS_BACKEND}" = "ceph" ]; then + ceph status + fi + echo "" echo "" if [ "${TEST_RESULT}" != "success" ]; then @@ -193,167 +197,8 @@ if [ "$#" -gt 0 ] && [ "$1" != "all" ] && [ "$1" != "cluster" ] && [ "$1" != "st exit fi -if [ "${1:-"all"}" != "cluster" ]; then - run_test test_check_deps "checking dependencies" - run_test test_database_restore "database restore" - run_test test_database_no_disk_space "database out of disk space" - run_test test_sql "SQL" - run_test test_tls_restrictions "TLS restrictions" - run_test test_certificate_edit "Certificate edit" - run_test test_basic_usage "basic usage" - run_test test_remote_url "remote url handling" - run_test test_remote_admin "remote administration" - run_test test_remote_usage "remote usage" -fi - -if [ "${1:-"all"}" != "standalone" ]; then - run_test test_clustering_enable "clustering enable" - run_test test_clustering_membership "clustering membership" - run_test test_clustering_containers "clustering containers" +if [ "${INCUS_BACKEND}" = "ceph" ]; then run_test test_clustering_storage "clustering storage" - run_test test_clustering_storage_single_node "clustering storage single node" - run_test test_clustering_network "clustering network" - run_test test_clustering_publish "clustering publish" - run_test test_clustering_profiles "clustering profiles" - run_test test_clustering_join_api "clustering join api" - run_test test_clustering_shutdown_nodes "clustering shutdown" - run_test test_clustering_projects "clustering projects" - run_test test_clustering_update_cert "clustering update cert" - run_test test_clustering_update_cert_reversion "clustering update cert reversion" - run_test test_clustering_address "clustering address" - run_test test_clustering_image_replication "clustering image replication" - run_test test_clustering_recover "clustering recovery" - run_test test_clustering_handover "clustering handover" - run_test test_clustering_rebalance "clustering rebalance" - run_test test_clustering_remove_raft_node "clustering remove raft node" - run_test test_clustering_failure_domains "clustering failure domains" - run_test test_clustering_image_refresh "clustering image refresh" - run_test test_clustering_evacuation "clustering evacuation" - run_test test_clustering_instance_placement_scriptlet "clustering instance placement scriptlet" - run_test test_clustering_move "clustering move" - run_test test_clustering_edit_configuration "clustering config edit" - run_test test_clustering_remove_members "clustering config remove members" - run_test test_clustering_autotarget "clustering autotarget member" - # run_test test_clustering_upgrade "clustering upgrade" - run_test test_clustering_groups "clustering groups" - run_test test_clustering_events "clustering events" - run_test test_clustering_uuid "clustering uuid" -fi - -if [ "${1:-"all"}" != "cluster" ]; then - run_test test_projects_default "default project" - run_test test_projects_crud "projects CRUD operations" - run_test test_projects_containers "containers inside projects" - run_test test_projects_snapshots "snapshots inside projects" - run_test test_projects_backups "backups inside projects" - run_test test_projects_profiles "profiles inside projects" - run_test test_projects_profiles_default "profiles from the global default project" - run_test test_projects_images "images inside projects" - run_test test_projects_images_default "images from the global default project" - run_test test_projects_storage "projects and storage pools" - run_test test_projects_network "projects and networks" - run_test test_projects_limits "projects limits" - run_test test_projects_usage "projects usage" - run_test test_projects_restrictions "projects restrictions" - run_test test_container_devices_disk "container devices - disk" - run_test test_container_devices_disk_restricted "container devices - disk - restricted" - run_test test_container_devices_nic_p2p "container devices - nic - p2p" - run_test test_container_devices_nic_bridged "container devices - nic - bridged" - run_test test_container_devices_nic_bridged_acl "container devices - nic - bridged - acl" - run_test test_container_devices_nic_bridged_filtering "container devices - nic - bridged - filtering" - run_test test_container_devices_nic_bridged_vlan "container devices - nic - bridged - vlan" - run_test test_container_devices_nic_physical "container devices - nic - physical" - run_test test_container_devices_nic_macvlan "container devices - nic - macvlan" - run_test test_container_devices_nic_ipvlan "container devices - nic - ipvlan" - run_test test_container_devices_nic_sriov "container devices - nic - sriov" - run_test test_container_devices_nic_routed "container devices - nic - routed" - run_test test_container_devices_infiniband_physical "container devices - infiniband - physical" - run_test test_container_devices_infiniband_sriov "container devices - infiniband - sriov" - run_test test_container_devices_proxy "container devices - proxy" - run_test test_container_devices_gpu "container devices - gpu" - run_test test_container_devices_unix_char "container devices - unix-char" - run_test test_container_devices_unix_block "container devices - unix-block" - run_test test_container_devices_tpm "container devices - tpm" - run_test test_container_syscall_interception "container syscall interception" - run_test test_security "security features" - run_test test_security_protection "container protection" - run_test test_image_expiry "image expiry" - run_test test_image_list_all_aliases "image list all aliases" - run_test test_image_auto_update "image auto-update" - run_test test_image_prefer_cached "image prefer cached" - run_test test_image_import_dir "import image from directory" - run_test test_image_refresh "image refresh" - run_test test_image_acl "image acl" - run_test test_cloud_init "cloud-init" - run_test test_exec "exec" - run_test test_concurrent_exec "concurrent exec" - run_test test_concurrent "concurrent startup" - run_test test_snapshots "container snapshots" - run_test test_snap_restore "snapshot restores" - run_test test_snap_expiry "snapshot expiry" - run_test test_snap_schedule "snapshot scheduling" - run_test test_snap_volume_db_recovery "snapshot volume database record recovery" - run_test test_config_profiles "profiles and configuration" - run_test test_config_edit "container configuration edit" - run_test test_property "container property" - run_test test_config_edit_container_snapshot_pool_config "container and snapshot volume configuration edit" - run_test test_container_metadata "manage container metadata and templates" - run_test test_container_snapshot_config "container snapshot configuration" - run_test test_server_config "server configuration" - run_test test_filemanip "file manipulations" - run_test test_network "network management" - run_test test_network_acl "network ACL management" - run_test test_network_forward "network address forwards" - run_test test_network_zone "network DNS zones" - run_test test_idmap "id mapping" - run_test test_template "file templating" - run_test test_pki "PKI mode" - run_test test_dev_incus "/dev/incus" - run_test test_fuidshift "fuidshift" - run_test test_migration "migration" - run_test test_lxc_to_incus "LXC to Incus" - run_test test_fdleak "fd leak" - run_test test_storage "storage" - run_test test_storage_volume_snapshots "storage volume snapshots" - run_test test_init_auto "incus admin init auto" - run_test test_init_interactive "incus admin init interactive" - run_test test_init_preseed "incus admin init preseed" - run_test test_storage_profiles "storage profiles" - run_test test_container_recover "container recover" - run_test test_bucket_recover "bucket recover" - run_test test_get_operations "test_get_operations" - run_test test_storage_volume_attach "attaching storage volumes" - run_test test_storage_driver_btrfs "btrfs storage driver" - run_test test_storage_driver_ceph "ceph storage driver" - run_test test_storage_driver_cephfs "cephfs storage driver" - run_test test_storage_driver_zfs "zfs storage driver" - run_test test_storage_buckets "storage buckets" - run_test test_storage_volume_import "storage volume import" - run_test test_storage_volume_initial_config "storage volume initial configuration" - run_test test_resources "resources" - run_test test_kernel_limits "kernel limits" - run_test test_console "console" - run_test test_query "query" - run_test test_storage_local_volume_handling "storage local volume handling" - run_test test_backup_import "backup import" - run_test test_backup_export "backup export" - run_test test_backup_rename "backup rename" - run_test test_backup_volume_export "backup volume export" - run_test test_backup_volume_rename_delete "backup volume rename and delete" - run_test test_backup_different_instance_uuid "backup instance and check instance UUIDs" - run_test test_backup_volume_expiry "backup volume expiry" - run_test test_backup_export_import_recover "backup export, import, and recovery" - run_test test_container_local_cross_pool_handling "container local cross pool handling" - run_test test_incremental_copy "incremental container copy" - run_test test_profiles_project_default "profiles in default project" - run_test test_profiles_project_images_profiles "profiles in project with images and profiles enabled" - run_test test_profiles_project_images "profiles in project with images enabled and profiles disabled" - run_test test_profiles_project_profiles "profiles in project with images disabled and profiles enabled" - run_test test_filtering "API filtering" - run_test test_warnings "Warnings" - run_test test_metrics "Metrics" - run_test test_storage_volume_recover "Recover storage volumes" - run_test test_syslog_socket "Syslog socket" fi # shellcheck disable=SC2034 diff --git a/test/suites/clustering.sh b/test/suites/clustering.sh index 9a92f048bc2..969ddd4d29c 100644 --- a/test/suites/clustering.sh +++ b/test/suites/clustering.sh @@ -770,7 +770,7 @@ test_clustering_storage() { INCUS_DIR="${INCUS_TWO_DIR}" incus stop foo --force # Init a new container on node2 using the snapshot on node1 - INCUS_DIR="${INCUS_ONE_DIR}" incus copy foo/snap-test egg --target node2 + INCUS_DIR="${INCUS_ONE_DIR}" incus copy foo/snap-test egg --target node2 --debug INCUS_DIR="${INCUS_TWO_DIR}" incus start egg INCUS_DIR="${INCUS_ONE_DIR}" incus stop egg --force INCUS_DIR="${INCUS_ONE_DIR}" incus delete egg