Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-05-10 17:39:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Wed May 10 17:39:20 2023 rev:294 rq:1086098 version:4.5.0+20230510.847a251b
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-04-27
20:00:54.141914195 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1533/crmsh.changes 2023-05-10
17:39:28.463685456 +0200
@@ -1,0 +2,13 @@
+Wed May 10 09:50:09 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230510.847a251b:
+ * Fix: bootstrap: `init --qnetd-hostname` fails when username is not
specified (bsc#1211200)
+
+-------------------------------------------------------------------
+Wed May 10 08:44:23 UTC 2023 - nicholas.y...@suse.com
+
+- Update to version 4.5.0+20230510.3343cc42:
+ * Dev: behave: Use 'su - <user>' instead of 'su <user>'
+ * Dev: Dockerfile: use opensuse/leap:15.5 for current CI
+
+-------------------------------------------------------------------
Old:
----
crmsh-4.5.0+20230427.11d11104.tar.bz2
New:
----
crmsh-4.5.0+20230510.847a251b.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.XSkGAp/_old 2023-05-10 17:39:28.959688388 +0200
+++ /var/tmp/diff_new_pack.XSkGAp/_new 2023-05-10 17:39:28.963688411 +0200
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0-or-later
Group: %{pkg_group}
-Version: 4.5.0+20230427.11d11104
+Version: 4.5.0+20230510.847a251b
Release: 0
URL: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.XSkGAp/_old 2023-05-10 17:39:29.003688648 +0200
+++ /var/tmp/diff_new_pack.XSkGAp/_new 2023-05-10 17:39:29.007688672 +0200
@@ -9,7 +9,7 @@
</service>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">03886aa3a42cdc817f65bcf88eaffc75a4d6845d</param>
+ <param
name="changesrevision">877dc3ef6793ab869f31040316e80988b4e6afe0</param>
</service>
</servicedata>
(No newline at EOF)
++++++ crmsh-4.5.0+20230427.11d11104.tar.bz2 ->
crmsh-4.5.0+20230510.847a251b.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230427.11d11104/Dockerfile
new/crmsh-4.5.0+20230510.847a251b/Dockerfile
--- old/crmsh-4.5.0+20230427.11d11104/Dockerfile 2023-04-27
08:13:57.000000000 +0200
+++ new/crmsh-4.5.0+20230510.847a251b/Dockerfile 2023-05-10
11:28:42.000000000 +0200
@@ -1,4 +1,4 @@
-FROM opensuse/leap:15.4
+FROM opensuse/leap:15.5
MAINTAINER Xin Liang <xli...@suse.com>
ARG ssh_prv_key
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230427.11d11104/crmsh/bootstrap.py
new/crmsh-4.5.0+20230510.847a251b/crmsh/bootstrap.py
--- old/crmsh-4.5.0+20230427.11d11104/crmsh/bootstrap.py 2023-04-27
08:13:57.000000000 +0200
+++ new/crmsh-4.5.0+20230510.847a251b/crmsh/bootstrap.py 2023-05-10
11:28:42.000000000 +0200
@@ -1626,7 +1626,10 @@
if qdevice_inst.ssh_user is not None:
# if the remote user is specified explicitly, use it
ssh_user = qdevice_inst.ssh_user
- local_user = utils.UserOfHost.instance().user_of(utils.this_node())
+ try:
+ local_user = utils.UserOfHost.instance().user_of(utils.this_node())
+ except utils.UserOfHost.UserNotFoundError:
+ local_user = ssh_user
else:
try:
# if ssh session has ready been available, use that
@@ -1634,7 +1637,10 @@
except utils.UserOfHost.UserNotFoundError:
pass
if ssh_user is None:
- local_user = userdir.get_sudoer()
+ try:
+ local_user = utils.UserOfHost.instance().user_of(utils.this_node())
+ except utils.UserOfHost.UserNotFoundError:
+ local_user = userdir.getuser()
ssh_user = local_user
# Configure ssh passwordless to qnetd if detect password is needed
if utils.check_ssh_passwd_need(local_user, ssh_user, qnetd_addr):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230427.11d11104/test/features/cluster_api.feature
new/crmsh-4.5.0+20230510.847a251b/test/features/cluster_api.feature
--- old/crmsh-4.5.0+20230427.11d11104/test/features/cluster_api.feature
2023-04-27 08:13:57.000000000 +0200
+++ new/crmsh-4.5.0+20230510.847a251b/test/features/cluster_api.feature
2023-05-10 11:28:42.000000000 +0200
@@ -21,12 +21,14 @@
@clean
Scenario: Start and stop resource by hacluster
- When Run "su hacluster -c 'crm resource stop d'" on "hanode1"
+ When Run "echo 'export PATH=$PATH:/usr/sbin/' >> ~hacluster/.bashrc" on
"hanode1"
+ When Run "echo 'export PATH=$PATH:/usr/sbin/' >> ~hacluster/.bashrc" on
"hanode2"
+ When Run "su - hacluster -c 'crm resource stop d'" on "hanode1"
Then Expected return code is "0"
When Wait "3" seconds
Then Resource "d" type "Dummy" is "Stopped"
And Show cluster status on "hanode1"
- When Run "su hacluster -c 'crm resource start d'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource start d'" on "hanode1"
Then Expected return code is "0"
When Wait "3" seconds
Then Resource "d" type "Dummy" is "Started"
@@ -36,51 +38,51 @@
Scenario: Resource move by hacluster
Given Resource "d" is started on "hanode1"
# move <res> <node>
- When Run "su hacluster -c 'crm resource move d hanode2'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource move d hanode2'" on "hanode1"
Then Expected return code is "0"
When Run "sleep 2" on "hanode1"
Then Resource "d" is started on "hanode2"
- When Run "su hacluster -c 'crm resource clear d'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource clear d'" on "hanode1"
Then Expected return code is "0"
# move <res> <node> force
- When Run "su hacluster -c 'crm resource move d hanode1'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource move d hanode1'" on "hanode1"
Then Expected return code is "0"
When Run "sleep 2" on "hanode1"
Then Resource "d" is started on "hanode1"
- When Run "su hacluster -c 'crm resource clear d'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource clear d'" on "hanode1"
Then Expected return code is "0"
# move <res> force
- When Run "su hacluster -c 'crm resource move d force'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource move d force'" on "hanode1"
Then Expected return code is "0"
When Run "sleep 2" on "hanode1"
Then Resource "d" is started on "hanode2"
- When Run "su hacluster -c 'crm resource clear d'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource clear d'" on "hanode1"
Then Expected return code is "0"
# move <res> <lifetime> force
- When Run "su hacluster -c 'crm resource move d PT5M force'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource move d PT5M force'" on
"hanode1"
Then Expected return code is "0"
When Run "sleep 2" on "hanode1"
Then Resource "d" is started on "hanode1"
- When Run "su hacluster -c 'crm resource clear d'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource clear d'" on "hanode1"
Then Expected return code is "0"
# move <res> <node> <lifetime>
- When Run "su hacluster -c 'crm resource move d hanode2 PT5M'" on
"hanode1"
+ When Run "su - hacluster -c 'crm resource move d hanode2 PT5M'" on
"hanode1"
Then Expected return code is "0"
When Run "sleep 2" on "hanode1"
Then Resource "d" is started on "hanode2"
- When Run "su hacluster -c 'crm resource clear d'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource clear d'" on "hanode1"
Then Expected return code is "0"
# move <res> <node> <lifetime> force
- When Run "su hacluster -c 'crm resource move d hanode1 PT5M force'" on
"hanode1"
+ When Run "su - hacluster -c 'crm resource move d hanode1 PT5M force'"
on "hanode1"
Then Expected return code is "0"
When Run "sleep 2" on "hanode1"
Then Resource "d" is started on "hanode1"
- When Run "su hacluster -c 'crm resource clear d'" on "hanode1"
+ When Run "su - hacluster -c 'crm resource clear d'" on "hanode1"
Then Expected return code is "0"
When Try "crm resource move d hanode2 PT5M force xxx"
@@ -99,7 +101,7 @@
And Wait "3" seconds
Then Resource "d2" type "Dummy" is "Started"
And Show cluster status on "hanode1"
- When Run "su hacluster -c 'crm configure show'" on "hanode1"
+ When Run "su - hacluster -c 'crm configure show'" on "hanode1"
Then Expected return code is "0"
And Expected multiple lines in output
"""
@@ -115,22 +117,22 @@
@clean
Scenario: pacemaker ACL related operations by hacluster
- When Run "su hacluster -c 'crm configure primitive d2 Dummy'" on
"hanode1"
+ When Run "su - hacluster -c 'crm configure primitive d2 Dummy'" on
"hanode1"
And Wait "3" seconds
Then Resource "d2" type "Dummy" is "Started"
- When Run "su hacluster -c 'crm maintenance on'" on "hanode1"
+ When Run "su - hacluster -c 'crm maintenance on'" on "hanode1"
When Run "crm_mon -1" on "hanode1"
Then Expected "Resource management is DISABLED" in stdout
- When Run "su hacluster -c 'crm maintenance off'" on "hanode1"
+ When Run "su - hacluster -c 'crm maintenance off'" on "hanode1"
When Run "crm_mon -1" on "hanode1"
Then Expected "Resource management is DISABLED" not in stdout
- When Run "su hacluster -c 'crm node standby hanode2'" on "hanode1"
+ When Run "su - hacluster -c 'crm node standby hanode2'" on "hanode1"
Then Node "hanode2" is standby
- When Run "su hacluster -c 'crm node online hanode2'" on "hanode1"
+ When Run "su - hacluster -c 'crm node online hanode2'" on "hanode1"
Then Node "hanode2" is online
- When Run "su hacluster -c 'crm ra providers Dummy'" on "hanode1"
+ When Run "su - hacluster -c 'crm ra providers Dummy'" on "hanode1"
Then Expected "heartbeat pacemaker" in stdout
- When Run "su hacluster -c 'crm status'" on "hanode1"
+ When Run "su - hacluster -c 'crm status'" on "hanode1"
Then Expected "Online: [ hanode1 hanode2 ]" in stdout
When Run "su - hacluster -c '/usr/sbin/crm report /tmp/report'" on
"hanode1"
Then File "/tmp/report.tar.bz2" exists on "hanode1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230427.11d11104/test/features/user_access.feature
new/crmsh-4.5.0+20230510.847a251b/test/features/user_access.feature
--- old/crmsh-4.5.0+20230427.11d11104/test/features/user_access.feature
2023-04-27 08:13:57.000000000 +0200
+++ new/crmsh-4.5.0+20230510.847a251b/test/features/user_access.feature
2023-05-10 11:28:42.000000000 +0200
@@ -6,7 +6,8 @@
Scenario: User in haclient group
Given Cluster service is "stopped" on "hanode1"
When Run "useradd -m -s /bin/bash -N -g 90 xin1" on "hanode1"
- When Try "su xin1 -c 'crm cluster init -y'"
+ When Run "echo 'export PATH=$PATH:/usr/sbin/' >> ~xin1/.bashrc" on
"hanode1"
+ When Try "su - xin1 -c 'crm cluster init -y'"
Then Except multiple lines
"""
ERROR: Please run this command starting with "sudo".
@@ -15,46 +16,47 @@
sudo bash -c 'echo "xin1 ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/xin1'
"""
When Run "echo "xin1 ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/xin1" on
"hanode1"
- When Try "su xin1 -c 'crm cluster init -y'"
+ When Try "su - xin1 -c 'crm cluster init -y'"
Then Except multiple lines
"""
ERROR: Please run this command starting with "sudo"
"""
- When Run "su xin1 -c 'sudo crm cluster init -y'" on "hanode1"
+ When Run "su - xin1 -c 'sudo crm cluster init -y'" on "hanode1"
Then Cluster service is "started" on "hanode1"
- When Run "useradd -m -s /bin/bash -N -g 90 xin2" on "hanode1"
- When Run "su xin2 -c 'crm node standby hanode1'" on "hanode1"
+ When Run "su - xin1 -c 'crm node standby hanode1'" on "hanode1"
Then Node "hanode1" is standby
@clean
Scenario: User in sudoer
Given Cluster service is "stopped" on "hanode1"
When Run "useradd -m -s /bin/bash xin3" on "hanode1"
+ When Run "echo 'export PATH=$PATH:/usr/sbin/' >> ~xin3/.bashrc" on
"hanode1"
And Run "echo "xin3 ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/xin3" on
"hanode1"
- When Try "su xin3 -c 'crm cluster init -y'"
+ When Try "su - xin3 -c 'crm cluster init -y'"
Then Except multiple lines
"""
WARNING: Failed to open log file: [Errno 13] Permission denied:
'/var/log/crmsh/crmsh.log'
ERROR: Please run this command starting with "sudo"
"""
- When Run "su xin3 -c 'sudo crm cluster init -y'" on "hanode1"
+ When Run "su - xin3 -c 'sudo crm cluster init -y'" on "hanode1"
Then Cluster service is "started" on "hanode1"
- When Try "su xin3 -c 'crm node standby hanode1'"
+ When Try "su - xin3 -c 'crm node standby hanode1'"
Then Except multiple lines
"""
WARNING: Failed to open log file: [Errno 13] Permission denied:
'/var/log/crmsh/crmsh.log'
ERROR: Please run this command starting with "sudo"
"""
- When Run "su xin3 -c 'sudo crm node standby hanode1'" on "hanode1"
+ When Run "su - xin3 -c 'sudo crm node standby hanode1'" on "hanode1"
Then Node "hanode1" is standby
@clean
Scenario: Normal user access
Given Cluster service is "stopped" on "hanode1"
When Run "useradd -m -s /bin/bash user1" on "hanode1"
- When Try "su user1 -c 'crm cluster init -y'"
+ When Run "echo 'export PATH=$PATH:/usr/sbin/' >> ~user1/.bashrc" on
"hanode1"
+ When Try "su - user1 -c 'crm cluster init -y'"
Then Except multiple lines
"""
WARNING: Failed to open log file: [Errno 13] Permission denied:
'/var/log/crmsh/crmsh.log'
@@ -64,17 +66,18 @@
sudo bash -c 'echo "user1 ALL=(ALL) NOPASSWD:ALL" >
/etc/sudoers.d/user1'
"""
When Run "echo "user1 ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/user1"
on "hanode1"
- When Try "su user1 -c 'crm cluster init -y'"
+ When Try "su - user1 -c 'crm cluster init -y'"
Then Except multiple lines
"""
WARNING: Failed to open log file: [Errno 13] Permission denied:
'/var/log/crmsh/crmsh.log'
ERROR: Please run this command starting with "sudo"
"""
- When Run "su user1 -c 'sudo crm cluster init -y'" on "hanode1"
+ When Run "su - user1 -c 'sudo crm cluster init -y'" on "hanode1"
Then Cluster service is "started" on "hanode1"
When Run "useradd -m -s /bin/bash user2" on "hanode1"
- When Try "su user2 -c 'crm node standby hanode1'"
+ When Run "echo 'export PATH=$PATH:/usr/sbin/' >> ~user2/.bashrc" on
"hanode1"
+ When Try "su - user2 -c 'crm node standby hanode1'"
Then Except multiple lines
"""
WARNING: Failed to open log file: [Errno 13] Permission denied:
'/var/log/crmsh/crmsh.log'
@@ -85,11 +88,12 @@
sudo usermod -g haclient user2
"""
When Run "usermod -g haclient user2" on "hanode1"
- When Run "su user2 -c 'crm node standby hanode1'" on "hanode1"
+ When Run "su - user2 -c 'crm node standby hanode1'" on "hanode1"
Then Node "hanode1" is standby
When Run "useradd -m -s /bin/bash user3" on "hanode1"
- When Try "su user3 -c 'crm node online hanode1'"
+ When Run "echo 'export PATH=$PATH:/usr/sbin/' >> ~user3/.bashrc" on
"hanode1"
+ When Try "su - user3 -c 'crm node online hanode1'"
Then Except multiple lines
"""
WARNING: Failed to open log file: [Errno 13] Permission denied:
'/var/log/crmsh/crmsh.log'
@@ -100,11 +104,11 @@
sudo usermod -g haclient user3
"""
When Run "echo "user3 ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/user3"
on "hanode1"
- When Try "su user3 -c 'crm node online hanode1'"
+ When Try "su - user3 -c 'crm node online hanode1'"
Then Except multiple lines
"""
WARNING: Failed to open log file: [Errno 13] Permission denied:
'/var/log/crmsh/crmsh.log'
ERROR: Please run this command starting with "sudo"
"""
- When Run "su user3 -c 'sudo crm node online hanode1'" on "hanode1"
+ When Run "su - user3 -c 'sudo crm node online hanode1'" on "hanode1"
Then Node "hanode1" is online
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230427.11d11104/test/run-functional-tests
new/crmsh-4.5.0+20230510.847a251b/test/run-functional-tests
--- old/crmsh-4.5.0+20230427.11d11104/test/run-functional-tests 2023-04-27
08:13:57.000000000 +0200
+++ new/crmsh-4.5.0+20230510.847a251b/test/run-functional-tests 2023-05-10
11:28:42.000000000 +0200
@@ -489,7 +489,7 @@
docker_exec ${node_arry[0]} "behave --no-logcapture
$case_file_in_container || exit 1" || exit 1
else
info "Running \"$case_file_in_container\" under normal user
'alice'..."
- docker_exec ${node_arry[0]} "su alice -c 'behave
--no-logcapture $case_file_in_container || exit 1'" || exit 1
+ docker_exec ${node_arry[0]} "su - alice -c 'behave
--no-logcapture $case_file_in_container || exit 1'" || exit 1
fi
echo
done
