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-12-15 21:49:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.25432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Fri Dec 15 21:49:24 2023 rev:316 rq:1133257 version:4.6.0+20231215.4b06740f
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-12-12
19:32:36.897313091 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.25432/crmsh.changes 2023-12-15
21:49:35.623247727 +0100
@@ -1,0 +2,16 @@
+Fri Dec 15 07:25:30 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231215.4b06740f:
+ * Fix: github-actions: fix file owner for git
+ * Dev: github-actions: update container image used in CD
+
+-------------------------------------------------------------------
+Thu Dec 14 08:21:04 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0rc1+20231214.b2728f3b:
+ * Dev: behave: Adjust functional test for previous change
+ * Dev: ui_cluster: Move --use-ssh-agent to optional arguments
+ * Fix: autoconf: --with-version does not override the variable used in
`version.in`
+ * Dev: unify version string used in setup.py and autotools
+
+-------------------------------------------------------------------
Old:
----
crmsh-4.6.0+20231212.54751d3f.tar.bz2
New:
----
crmsh-4.6.0+20231215.4b06740f.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.S9eHSR/_old 2023-12-15 21:49:36.203269068 +0100
+++ /var/tmp/diff_new_pack.S9eHSR/_new 2023-12-15 21:49:36.207269215 +0100
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0-or-later
Group: %{pkg_group}
-Version: 4.6.0+20231212.54751d3f
+Version: 4.6.0+20231215.4b06740f
Release: 0
URL: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _service ++++++
--- /var/tmp/diff_new_pack.S9eHSR/_old 2023-12-15 21:49:36.235270245 +0100
+++ /var/tmp/diff_new_pack.S9eHSR/_new 2023-12-15 21:49:36.239270393 +0100
@@ -3,7 +3,9 @@
<param name="url">https://github.com/ClusterLabs/crmsh.git</param>
<param name="scm">git</param>
<param name="filename">crmsh</param>
- <param name="versionformat">4.6.0+%cd.%h</param>
+ <param name="versionformat">@PARENT_TAG@+%cd.%h</param>
+ <param name="versionrewrite-pattern">(\d+\.\d+\.\d+)(?:-rc\d+)?(.*)</param>
+ <param name="versionrewrite-replacement">\1\2</param>
<param name="revision">crmsh-4.6</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.S9eHSR/_old 2023-12-15 21:49:36.259271128 +0100
+++ /var/tmp/diff_new_pack.S9eHSR/_new 2023-12-15 21:49:36.263271276 +0100
@@ -9,7 +9,7 @@
</service>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">db02a38df79fc1e1ee20c9dc4d1c39028e2c3c11</param>
+ <param
name="changesrevision">45d75431d8a38cd927519ca927cbc75e1e4dad7c</param>
</service>
</servicedata>
(No newline at EOF)
++++++ crmsh-4.6.0+20231212.54751d3f.tar.bz2 ->
crmsh-4.6.0+20231215.4b06740f.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.6.0+20231212.54751d3f/.github/workflows/crmsh-cd.yml
new/crmsh-4.6.0+20231215.4b06740f/.github/workflows/crmsh-cd.yml
--- old/crmsh-4.6.0+20231212.54751d3f/.github/workflows/crmsh-cd.yml
2023-12-12 03:47:05.000000000 +0100
+++ new/crmsh-4.6.0+20231215.4b06740f/.github/workflows/crmsh-cd.yml
2023-12-15 07:49:46.000000000 +0100
@@ -7,8 +7,8 @@
on: push
env:
- FOLDER: /package
PACKAGE_NAME: crmsh
+ CONTAINER_IMAGE: nyang23/obs-continuous-delivery:latest
OBS_USER: ${{ secrets.OBS_USER }}
OBS_PASS: ${{ secrets.OBS_PASS }}
OBS_PROJECT: ${{ secrets.OBS_PROJECT_CRMSH45 }}
@@ -28,15 +28,14 @@
- uses: actions/checkout@v3
- name: delivery process
run: |
- docker pull shap/continuous_deliver:latest
- docker run -t -v "$(pwd):/package" \
+ docker pull "${CONTAINER_IMAGE}"
+ docker run -t -v "$(pwd)":/package:ro \
-e OBS_USER=$OBS_USER \
-e OBS_PASS=$OBS_PASS \
- -e FOLDER=$FOLDER \
-e OBS_PROJECT=$OBS_PROJECT \
-e PACKAGE_NAME=$PACKAGE_NAME \
- shap/continuous_deliver \
- /bin/bash -c "cd /package;/scripts/upload.sh"
+ "${CONTAINER_IMAGE}" \
+ /bin/bash -c "cp -r /package ~/package && cd ~/package &&
/scripts/upload.sh"
submit:
if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.6'
@@ -47,12 +46,12 @@
- uses: actions/checkout@v3
- name: submit process
run: |
- docker pull shap/continuous_deliver:latest
- docker run -t -v "$(pwd):/package" \
+ docker pull "${CONTAINER_IMAGE}"
+ docker run -t \
-e OBS_USER=$OBS_USER \
-e OBS_PASS=$OBS_PASS \
-e OBS_PROJECT=$OBS_PROJECT \
-e PACKAGE_NAME=$PACKAGE_NAME \
-e TARGET_PROJECT=$TARGET_PROJECT \
- shap/continuous_deliver \
- /bin/bash -c "cd /package;/scripts/submit.sh"
+ "${CONTAINER_IMAGE}" \
+ /bin/bash -c "cd ~ && /scripts/submit.sh"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231212.54751d3f/.gitignore
new/crmsh-4.6.0+20231215.4b06740f/.gitignore
--- old/crmsh-4.6.0+20231212.54751d3f/.gitignore 1970-01-01
01:00:00.000000000 +0100
+++ new/crmsh-4.6.0+20231215.4b06740f/.gitignore 2023-12-15
07:49:46.000000000 +0100
@@ -0,0 +1,43 @@
+*.pyc
+*~
+#*.*#
+.#*
+doc/website-v1/gen
+Makefile.in
+autom4te.cache
+Makefile
+aclocal.m4
+autoconf
+autoheader
+automake
+config.log
+config.status
+configure
+crm.conf
+crmsh.spec
+install-sh
+missing
+version
+crmsh.egg-info/*
+crmtestout/*
+doc/crm.8
+doc/crm.8.html
+doc/crmsh_hb_report.8
+doc/crmsh_hb_report.8.html
+hb_report/hb_report
+patches/*
+build/*
+
+# Tool specific files
+.README.md.html
+.*.*~
+.project
+.settings
+.pydevproject
+.coverage
+
+contrib/build/
+contrib/dist/
+contrib/pygments_crmsh_lexers.egg-info/
+
+.tox/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231212.54751d3f/crmsh/ui_cluster.py
new/crmsh-4.6.0+20231215.4b06740f/crmsh/ui_cluster.py
--- old/crmsh-4.6.0+20231212.54751d3f/crmsh/ui_cluster.py 2023-12-12
03:47:05.000000000 +0100
+++ new/crmsh-4.6.0+20231215.4b06740f/crmsh/ui_cluster.py 2023-12-15
07:49:46.000000000 +0100
@@ -528,14 +528,14 @@
parser.add_argument("-q", "--quiet", help="Be quiet (don't describe
what's happening, just do it)", action="store_true", dest="quiet")
parser.add_argument("-y", "--yes", help='Answer "yes" to all prompts
(use with caution)', action="store_true", dest="yes_to_all")
parser.add_argument("-w", "--watchdog", dest="watchdog",
metavar="WATCHDOG", help="Use the given watchdog device")
+ parser.add_argument('--use-ssh-agent', action='store_true',
dest='use_ssh_agent',
+ help="Use an existing key from ssh-agent instead
of creating new key pairs")
network_group = parser.add_argument_group("Network configuration",
"Options for configuring the network and messaging layer.")
network_group.add_argument(
"-c", "--cluster-node", metavar="[USER@]HOST", dest="cluster_node",
help="User and host to login to an existing cluster node. The host
can be specified with either a hostname or an IP.",
)
- network_group.add_argument('--use-ssh-agent', action='store_true',
dest='use_ssh_agent',
- help="Use an existing key from ssh-agent instead
of creating new key pairs")
network_group.add_argument("-i", "--interface", dest="nic_list",
metavar="IF", action=CustomAppendAction, choices=utils.interface_choice(),
default=[],
help="Bind to IP address on interface IF. Use -i second time
for second interface")
options, args = parse_options(parser, args)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231212.54751d3f/setup.py
new/crmsh-4.6.0+20231215.4b06740f/setup.py
--- old/crmsh-4.6.0+20231212.54751d3f/setup.py 2023-12-12 03:47:05.000000000
+0100
+++ new/crmsh-4.6.0+20231215.4b06740f/setup.py 2023-12-15 07:49:46.000000000
+0100
@@ -2,9 +2,19 @@
# Note that this script only installs the python modules,
# the other parts of crmsh are installed by autotools
from setuptools import setup
+import contextlib
+import re
+
+VERSION = '0.0.1'
+
+with contextlib.suppress(Exception):
+ with open('version', 'r', encoding='ascii') as f:
+ match = re.match('^\\d+\\.\\d+\\.\\d+', f.read().strip())
+ if match:
+ VERSION = match.group(0)
setup(name='crmsh',
- version='4.5.0',
+ version=VERSION,
description='Command-line interface for High-Availability cluster
management',
author='Kristoffer Gronlund, Xin Liang',
author_email='xli...@suse.com',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.6.0+20231212.54751d3f/test/features/steps/const.py
new/crmsh-4.6.0+20231215.4b06740f/test/features/steps/const.py
--- old/crmsh-4.6.0+20231212.54751d3f/test/features/steps/const.py
2023-12-12 03:47:05.000000000 +0100
+++ new/crmsh-4.6.0+20231215.4b06740f/test/features/steps/const.py
2023-12-15 07:49:46.000000000 +0100
@@ -222,6 +222,8 @@
-y, --yes Answer "yes" to all prompts (use with caution)
-w WATCHDOG, --watchdog WATCHDOG
Use the given watchdog device
+ --use-ssh-agent Use an existing key from ssh-agent instead of creating
+ new key pairs
Network configuration:
Options for configuring the network and messaging layer.
@@ -230,8 +232,6 @@
User and host to login to an existing cluster node.
The host can be specified with either a hostname or an
IP.
- --use-ssh-agent Use an existing key from ssh-agent instead of creating
- new key pairs
-i IF, --interface IF
Bind to IP address on interface IF. Use -i second time
for second interface
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231212.54751d3f/version.in
new/crmsh-4.6.0+20231215.4b06740f/version.in
--- old/crmsh-4.6.0+20231212.54751d3f/version.in 2023-12-12
03:47:05.000000000 +0100
+++ new/crmsh-4.6.0+20231215.4b06740f/version.in 2023-12-15
07:49:46.000000000 +0100
@@ -1 +1 @@
-@VERSION@
+@PACKAGE_VERSION@
