From 73358b9ee99703726db95675a6bd808a0af7d61a Mon Sep 17 00:00:00 2001 From: nicholasyang Date: Sun, 29 Sep 2024 17:23:43 +0800 Subject: [PATCH] Fix: testcases: adapt to pacemaker updates --- test/testcases/resource.exp | 62 +++++++++++++++++++++---------------- test_container/Dockerfile | 2 +- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/test/testcases/resource.exp b/test/testcases/resource.exp index 22d04eca45..3d62186f96 100644 --- a/test/testcases/resource.exp +++ b/test/testcases/resource.exp @@ -1147,36 +1147,44 @@ INFO: "rm" is accepted as "delete" .EXT crm_simulate -sUL 2 of 6 resource instances DISABLED and 0 BLOCKED from further action due to failure -Node node1: UNCLEAN (offline) +Current cluster status: + * Node List: + * Node node1: UNCLEAN (offline) - st (stonith:null): Stopped - Stopped: [ node1 ] - Stopped: [ node1 ] -p3 (ocf:heartbeat:Dummy): Stopped (disabled) - Stopped: [ node1 ] + * Full List of Resources: + * st (stonith:null): Stopped + * Clone Set: c1 [p1] (unmanaged): + * Stopped: [ node1 ] + * Clone Set: m1 [p2] (promotable): + * Stopped: [ node1 ] + * p3 (ocf:heartbeat:Dummy): Stopped (disabled) + * Clone Set: msg [g] (promotable): + * Stopped: [ node1 ] -Original: node1 capacity: -pcmk__primitive_assign: st allocation score on node1: 0 -pcmk__clone_assign: c1 allocation score on node1: 0 -pcmk__clone_assign: p1:0 allocation score on node1: 0 -pcmk__primitive_assign: p1:0 allocation score on node1: -INFINITY -pcmk__clone_assign: m1 allocation score on node1: 0 -pcmk__clone_assign: p2:0 allocation score on node1: 0 -pcmk__primitive_assign: p2:0 allocation score on node1: -INFINITY -p2:0 promotion score on none: 0 -pcmk__primitive_assign: p3 allocation score on node1: -INFINITY -pcmk__clone_assign: msg allocation score on node1: 0 -pcmk__clone_assign: g:0 allocation score on node1: 0 -pcmk__clone_assign: p0:0 allocation score on node1: 0 -pcmk__clone_assign: p4:0 allocation score on node1: 0 -pcmk__group_assign: g:0 allocation score on node1: -INFINITY -pcmk__group_assign: p0:0 allocation score on node1: -INFINITY -pcmk__group_assign: p4:0 allocation score on node1: -INFINITY -pcmk__primitive_assign: p0:0 allocation score on node1: -INFINITY -pcmk__primitive_assign: p4:0 allocation score on node1: -INFINITY -g:0 promotion score on none: 0 -Remaining: node1 capacity: +Assignment Scores and Utilization Information: + * Original: node1 capacity: + * pcmk__primitive_assign: st allocation score on node1: 0 + * pcmk__clone_assign: c1 allocation score on node1: 0 + * pcmk__clone_assign: p1:0 allocation score on node1: 0 + * pcmk__primitive_assign: p1:0 allocation score on node1: -INFINITY + * pcmk__clone_assign: m1 allocation score on node1: 0 + * pcmk__clone_assign: p2:0 allocation score on node1: 0 + * pcmk__primitive_assign: p2:0 allocation score on node1: -INFINITY + * p2:0 promotion score (inactive): -INFINITY + * pcmk__primitive_assign: p3 allocation score on node1: -INFINITY + * pcmk__clone_assign: msg allocation score on node1: 0 + * pcmk__clone_assign: g:0 allocation score on node1: 0 + * pcmk__clone_assign: p0:0 allocation score on node1: 0 + * pcmk__clone_assign: p4:0 allocation score on node1: 0 + * pcmk__group_assign: g:0 allocation score on node1: -INFINITY + * pcmk__group_assign: p0:0 allocation score on node1: -INFINITY + * pcmk__group_assign: p4:0 allocation score on node1: -INFINITY + * pcmk__primitive_assign: p0:0 allocation score on node1: -INFINITY + * pcmk__primitive_assign: p4:0 allocation score on node1: -INFINITY + * g:0 promotion score (inactive): -INFINITY + * Remaining: node1 capacity: +Transition Summary: .SETENV showobj= .TRY configure primitive p5 Dummy .EXT crm_resource --show-metadata ocf:heartbeat:Dummy diff --git a/test_container/Dockerfile b/test_container/Dockerfile index 3b47645560..c84a24f9d7 100644 --- a/test_container/Dockerfile +++ b/test_container/Dockerfile @@ -1,4 +1,4 @@ -FROM opensuse/tumbleweed +FROM docker.io/opensuse/tumbleweed MAINTAINER Xin Liang CMD ["/usr/lib/systemd/systemd", "--system"]