Skip to content

[crmsh-4.6] Dev: Dockerfile: Update pacemaker version to the latest 2.1.10 #1930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: crmsh-4.6
Choose a base branch
from
Open

[crmsh-4.6] Dev: Dockerfile: Update pacemaker version to the latest 2.1.10 #1930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7343166
Dev: Dockerfile: Update pacemaker version to the latest 2.1.10
liangxin1300 Sep 26, 2025
37a4dc7
Dev: testcases: Adjust original functional testcases for previous commit
liangxin1300 Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/run-functional-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
DOCKER_IMAGE=${DOCKER_IMAGE:-"liangxin1300/haleap:15.6"}
DOCKER_IMAGE=${DOCKER_IMAGE:-"liangxin1300/haleap:15.7"}
PROJECT_PATH=$(dirname $(dirname `realpath $0`))
PROJECT_INSIDE="/opt/crmsh"
DOCKER_SERVICE="docker.service"
Expand Down
3 changes: 0 additions & 3 deletions test/testcases/acl.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
.INP: _test
.INP: verify
.EXT crm_attribute --list-options=cluster --all --output-as=xml
.EXT crmd metadata
.EXT pengine metadata
.EXT cib metadata
.INP: show
node node1
primitive d0 ocf:pacemaker:Dummy \
Expand Down
3 changes: 0 additions & 3 deletions test/testcases/bundle.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
.INP: _test
.INP: verify
.EXT crm_attribute --list-options=cluster --all --output-as=xml
.EXT crmd metadata
.EXT pengine metadata
.EXT cib metadata
.INP: show
node node1 \
attributes mem=16G
Expand Down
18 changes: 12 additions & 6 deletions test/testcases/confbasic.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,12 @@ INFO: 37: "collocation" is accepted as "colocation"
.INP: set d2.mondelay 45
.INP: _test
.INP: verify
warning: Support for <master> (such as in m) is deprecated and will be removed in a future release. Use <clone> with a promotable meta-attribute instead.
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
warning: Support for the Master role is deprecated and will be removed in a future release. Use Promoted instead.
Warnings found during check: config not valid
WARNING: 53: c2: resource d1 is grouped, constraints should apply to the group
.EXT crm_attribute --list-options=cluster --all --output-as=xml
.EXT crmd metadata
.EXT pengine metadata
.EXT cib metadata
.INP: show
node node1 \
attributes mem=16G
Expand Down Expand Up @@ -187,6 +188,10 @@ op_defaults opsdef2: \
rule 100: #uname eq node1 \
record-pending=true
.INP: commit
warning: Support for <master> (such as in m) is deprecated and will be removed in a future release. Use <clone> with a promotable meta-attribute instead.
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
warning: Support for the Master role is deprecated and will be removed in a future release. Use Promoted instead.
Warnings found during check: config not valid
WARNING: 55: c2: resource d1 is grouped, constraints should apply to the group
.TRY -F node maintenance node1
.TRY -F resource maintenance g1 off
Expand All @@ -195,7 +200,8 @@ WARNING: 55: c2: resource d1 is grouped, constraints should apply to the group
INFO: 'maintenance' attribute already exists in d1. Remove it? [YES]
INFO: 'maintenance' attribute already exists in g1. Remove it? [YES]
INFO: 'maintenance' attribute already exists in node1. Remove it? [YES]
warning: Support for <master> (such as in m) is deprecated and will be removed in a future release. Use <clone> with a promotable meta-attribute instead.
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
warning: Support for the Master role is deprecated and will be removed in a future release. Use Promoted instead.
Warnings found during check: config not valid
.EXT crm_attribute --list-options=cluster --all --output-as=xml
.EXT crmd metadata
.EXT pengine metadata
.EXT cib metadata
13 changes: 10 additions & 3 deletions test/testcases/edit.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,13 @@ rsc_defaults rsc_options: \
op_defaults op-options: \
timeout=60s
.INP: commit
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
Warnings found during check: config not valid
.EXT crm_attribute --list-options=cluster --all --output-as=xml
.EXT crmd metadata
.EXT pengine metadata
.EXT cib metadata
.INP: _test
.INP: verify
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
Warnings found during check: config not valid
.INP: primitive a0 ocf:heartbeat:Dummy
.INP: primitive a1 ocf:heartbeat:Dummy
.INP: primitive a2 ocf:heartbeat:Dummy
Expand All @@ -215,11 +216,15 @@ op_defaults op-options: \
.INP: primitive aErr ocf:heartbeat:Dummy
.INP: group as a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aErr
.INP: commit
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
Warnings found during check: config not valid
.INP: cd ..
.INP: cd configure
.INP: filter "sed '/as/s/a9//'"
.INP: filter "sed '/as/s/a1/a1 a9/'"
.INP: commit
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
Warnings found during check: config not valid
.INP: cd ..
.INP: cd configure
.INP: filter "sed '/abs/s/a9//'"
Expand Down Expand Up @@ -331,6 +336,8 @@ INFO: 89: apparently there is nothing to commit
INFO: 89: try changing something first
.INP: _test
.INP: verify
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
Warnings found during check: config not valid
.INP: show
node node1 \
attributes mem=16G
Expand Down
3 changes: 0 additions & 3 deletions test/testcases/file.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ op_defaults op-options: \
.INP: load update sample.txt
ERROR: 4: syntax: Unknown command near <op> parsing 'op stop timeout=20s interval=0s'
.EXT crm_attribute --list-options=cluster --all --output-as=xml
.EXT crmd metadata
.EXT pengine metadata
.EXT cib metadata
.TRY configure show
node node1
primitive p0 ocf:pacemaker:Dummy \
Expand Down
3 changes: 0 additions & 3 deletions test/testcases/newfeatures.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,4 @@ alert notify_9 "/usr/share/pacemaker/alerts/alert_snmp.sh" \
.INP: _test
.INP: verify
.EXT crm_attribute --list-options=cluster --all --output-as=xml
.EXT crmd metadata
.EXT pengine metadata
.EXT cib metadata
.INP: commit
Loading