Merge remote-tracking branch 'upstream/crmsh-4.6' into 20240229_merge_crmsh46_into_master

Author: liangxin1300

.github/workflows/crmsh-cd.yml

@@ -7,38 +7,38 @@ name: crmsh CD
 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 }}
   TARGET_PROJECT: ${{ secrets.TARGET_PROJECT }}
 
 jobs:
   integration:
-    if: github.repository == 'ClusterLabs/crmsh' && github.ref == 'refs/heads/master'
+    if: github.repository == 'ClusterLabs/crmsh' && github.ref_name == 'master'
     uses: ./.github/workflows/crmsh-ci.yml
 
   delivery:
-    if: github.repository == 'ClusterLabs/crmsh' && github.ref == 'refs/heads/master'
+    if: github.repository == 'ClusterLabs/crmsh' && github.ref_name == 'master'
     needs: integration
     runs-on: ubuntu-20.04
     timeout-minutes: 10
     steps:
     - 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 == 'master'
     needs: delivery
     runs-on: ubuntu-20.04
     timeout-minutes: 10
@@ -47,12 +47,12 @@ jobs:
     - 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"

.github/workflows/crmsh-ci.yml

@@ -54,14 +54,27 @@ jobs:
     timeout-minutes: 40
     steps:
     - uses: actions/checkout@v3
-    - name: functional test for crm_report
+    - name: functional test for crm_report bugs
       run:  |
         echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee /etc/docker/daemon.json
         sudo systemctl restart docker.service
         index=`$GET_INDEX_OF crm_report_bugs`
         $DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
     - uses: codecov/codecov-action@v3
 
+  functional_test_crm_report_normal:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 40
+    steps:
+    - uses: actions/checkout@v3
+    - name: functional test for crm_report normal
+      run:  |
+        echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee /etc/docker/daemon.json
+        sudo systemctl restart docker.service
+        index=`$GET_INDEX_OF crm_report_normal`
+        $DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
+    - uses: codecov/codecov-action@v3
+
   functional_test_bootstrap_bugs:
     runs-on: ubuntu-20.04
     timeout-minutes: 40
@@ -333,6 +346,18 @@ jobs:
         $DOCKER_SCRIPT `$GET_INDEX_OF user_access`
     - uses: codecov/codecov-action@v3
 
+  functional_test_ssh_agent:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 40
+    steps:
+    - uses: actions/checkout@v3
+    - name: functional test for user access
+      run:  |
+        echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee /etc/docker/daemon.json
+        sudo systemctl restart docker.service
+        $DOCKER_SCRIPT `$GET_INDEX_OF ssh_agent` && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT -u `$GET_INDEX_OF ssh_agent`
+    - uses: codecov/codecov-action@v3
+
   original_regression_test:
     runs-on: ubuntu-20.04
     timeout-minutes: 40

ChangeLog

@@ -1,4 +1,89 @@
-* Thu Mar 30 2023 Xin Liang <[email protected]>
+* Tue Jan 9 2024 Xin Liang <[email protected]>
+- Release 4.6.0
+- Fix: report: Unable to gather log files that are in the syslog format (bsc#1218491)
+- Dev: ui_corosync: Add a completer for corosync.set to enumerate all current paths
+- Dev: bootstrap: Assign hosts with _context.node_list_in_cluster in join_ssh_merge (bsc#1218331)
+
+* Fri Dec 22 2023 Xin Liang <[email protected]>
+- Release 4.6.0 rc2
+- 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
+- Fix: ui_cluster: Improve the process of 'crm cluster stop' (bsc#1213889)
+- Fix: scripts.health: call `setup_logging()` before importing crmsh.reprot.utils
+- Dev: log: save backtrace of ValueError in logfile and suppress it in console
+
+* Thu Dec 7 2023 Xin Liang <[email protected]>
+- Release 4.6.0 rc1
+- Dev: doc: Unify contents of manpage and help info
+- Dev: report: Rewrite crm report module
+- Dev: utils: To prevent shell injection, manipulate the argument array instead of the command line string
+- Fix: bootstrap: fix the owner and permission of file authorized_keys (bsc#1217279)
+- Fix: prun: should not call user_pair_for_ssh() when target host is localhost (bsc#1217094)
+- Dev: report: Redirect warning and error from remote node into stderr
+- Fix: utils: Add 'sudo' only when there is a sudoer(bsc#1215549)
+- Dev: xmlutil: refactor class CrmMonXmlParser
+- Dev: completers: Add online_nodes and standby_nodes
+- Fix: bootstrap: add informative logging for generating new ssh keypairs
+- Fix: forward ssh-agent for `crm report __slave`
+- Fix: sh: raise AuthorizationError and generate diagnose messages when ClusterShell fails with 255
+- Dev: bootstrap: allow to authenticate interactively in `crm cluster join --use-ssh-agent`
+- Dev: ssh-agent: add informative logging for adding keys to authorized_keys
+- Dev: ssh-agent: add diagnose messages
+- Dev: bootstrap: implement ssh-agent support for geo cluster (jsc#PED-5774)
+- Dev: bootstrap: refine key swap for user `hacluster`
+- Dev: bootstrap: implement ssh-agent support for qdevice (jsc#PED-5774)
+- Dev: bootstrap: implement ssh-agent support (jsc#PED-5774)
+- Dev: ui_utils: Supports '=' when setting node/resource attributes
+- Fix: report: Pick up tarball suffix dynamically (bsc#1215438)
+- Fix: report: Pick 'gzip' as the first compress prog for cross-platform compatibility(bsc#1215438)
+- Fix: constants: Add several resource meta attributes (bsc#1215319)
+- refactor: move get_stdout and get_stdout_stderr to crmsh.sh.ShellUtils
+- Dev: refactor shell calling routines
+- Dev: utils: strip new line when get_stdout_or_raise_error returns
+- Fix: prun: setsid to prevent ssh from asking a password from terminal
+- Fix: upgradeutil: reduce the timeout for getting sequence from remote node (bsc#1213797)
+- Fix: userdir: Get the effictive user name instead of using getpass.getuser (bsc#1213821)
+- Dev: requirements: remove parallax
+- Fix: upgradeutil: support the change of path of upgrade_seq in crmsh-4.5 (bsc#1213050)
+- Fix: ui_context: wait4dc should assume a subcommand completes successfully if no exceptions are raised (bsc#1212992)
+- Fix: upgradeutil: do not tried to upgrade when the cluster is partially set up
+- Fix: bootstrap: fix the validation of option -N and -c (bsc#1212436)
+- Fix: geo_cluster: the behavior of choosing a default user in geo_join/geo_init_arbitrator is different with `cluster join` (bsc#1211817)
+- Fix: utils: do not use sudoer user to create ssh session unless it is specified explicitly (bsc#1211817)
+- medium: ui_node: fix cib rollback race on node standby
+- Dev: ui_cluster: Use 'CustomAppendAction' instead of 'append' argparse action
+- Dev: bootstrap: Configure ssh key when fetch geo config
+- Dev: cmd_status: Use --output-as option instead of deprecated --as-html and --as-xml options
+- Dev: cmd_status: Append 'with quorum' and 'WITHOUT quorum' to display keyword list
+- Dev: spec: Remove python3-parallax from spec file
+- Fix: bootstrap: failed to save username for localhost when initializing a cluster with a qnet server
+- Fix: utils: fix `cluster diff --checksum`
+- Dev: ui_cluster: refine messages for `cluster run` and `cluster coy`
+- Dev: geo: implement non-root support for geo_fetch_config()
+- Fix: bootstrap: failed to join when the cluster is initialized with skip_csync2
+- Dev: prun: minor refactor and add comments
+- Dev: prun: implement timeout
+- Dev: prun: add an concurrency limiter
+- Dev: remove python dependency parallax
+- Dev: scripts: implement non-root support with crmsh.prun
+- Dev: implement non-root support for crm_pssh with crmsh.prun
+- Dev: remove some direct calls to parallax module
+- Dev: prun: add special handling for localhost
+- Dev: refine non-root sudoer support for crmsh.parallax.parallax_slurp
+- Dev: refine non-root sudoer support for crmsh.parallax.parallax_copy
+- Dev: upgradeutil: adapt to new parallax interface
+- Dev: refine non-root sudoer support for crmsh.parallax.parallax_call (bsc#1210709)
+- Fix: bootstrap: `init --qnetd-hostname` fails when username is not specified (bsc#1211200)
+- Fix: bootstrap: crm cluster join default behavior change in ssh key handling (bsc#1210693)
+- Fix: help: Long time to load and parse crm.8.adoc (bsc#1210198)
+- Fix: cibconfig: use any existing rsc_defaults set rather than create another one (bsc#1210614)
+- Fix: lock: Join node failed to wait init node finished (bsc#1210332)
+- Dev: log_patterns: update patterns for pacemaker version 2.0+
+- Dev: bootstrap: Support replacing sbd device via sbd stage
+- Dev: utils: add auto_convert_role flag for handle_role_for_ocf_1_1 function
+
+*Thu Mar 30 2023 Xin Liang <[email protected]>
 - Release 4.5.0
 - Dev: bootstrap: Remove /var/lib/crm and ~/.config/crm/crm.conf when removing node
 - Dev: bootstrap: Generate the public key on the remote if it does not exist

codecov.yml

@@ -2,13 +2,16 @@ coverage:
   status:
     project:
       default:
-        threshold: 0.1%
+        threshold: 0.35%
     patch:
       default:
-        threshold: 0.1%
+        threshold: 0.35%
 codecov: 
   token: 16b01c29-3b23-4923-b33a-4d26a49d80c4
   notify:
-    after_n_builds: 22
+    after_n_builds: 23
 comment:
-  after_n_builds: 22
+  after_n_builds: 23
+
+ignore:
+  - "crmsh/report"

crmsh.spec.in

@@ -1,7 +1,7 @@
 #
 # spec file for package crmsh
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -55,6 +55,7 @@ Requires:       python3-PyYAML
 Requires:       python3-lxml
 Requires:       python3-packaging
 BuildRequires:  python3-lxml
+BuildRequires:  python3-setuptools
 BuildRequires:  python3-pip
 BuildRequires:  python3-wheel