From 13d8772baa6d131e859e61d4826773d0e9e209d9 Mon Sep 17 00:00:00 2001
From: William Poteat <wpoteat@redhat.com>
Date: Thu, 22 Apr 2021 12:11:23 -0400
Subject: [PATCH] Update subscription-manager to 1.29.11-1 Resolves: #1940658 -
 bash: complete also the syspurpose subcommand (ptoscano@redhat.com)

---
 .gitignore                |  2 ++
 sources                   |  4 +--
 subscription-manager.spec | 14 ++++++++-
 tests/smoke/smoke.sh      | 63 +++++++++++++++++++++++++++++++++++++++
 tests/tests.yml           | 21 +++++++++++++
 5 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100755 tests/smoke/smoke.sh
 create mode 100644 tests/tests.yml

diff --git a/.gitignore b/.gitignore
index 648f951..e30502a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,5 @@
 /subscription-manager-cockpit-1.29.9.tar.gz
 /subscription-manager-1.29.10.tar.gz
 /subscription-manager-cockpit-1.29.10.tar.gz
+/subscription-manager-1.29.11.tar.gz
+/subscription-manager-cockpit-1.29.11.tar.gz
diff --git a/sources b/sources
index 4503085..5237716 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (subscription-manager-1.29.10.tar.gz) = 8417782bb059f125c9124e18347ebdf3a486b80009f2265a65903f07db554793a9f0fb247627c8c7859be1c8e4a1557d20dc035f80abcf7303d75da0270341f2
-SHA512 (subscription-manager-cockpit-1.29.10.tar.gz) = 8e182fa7fb008a8996e22d860b21b130584f902d167632248ebf306bc206d626487cfb59c03ac4ca66f7a784813c4eae644c7bbaa37af643c0d1270e901f5ce9
+SHA512 (subscription-manager-1.29.11.tar.gz) = ce59ade8bb126deb50c27954bc4f75af4c762367c503c05123a1937a7f4055203a43329f4c6c9a6742c42fddd4ad17a9adf033222915e0f9033c98b95a4b9311
+SHA512 (subscription-manager-cockpit-1.29.11.tar.gz) = 00fce7d4606f0d0ae490aa67c066538dde63c5a5b36ea4c6adb9b004a065ab3feb2b802c4ec01fafc79f98390957b8ab8bfe7d9a3300725942644cc5e6516793
diff --git a/subscription-manager.spec b/subscription-manager.spec
index d13d825..5eb2f2c 100644
--- a/subscription-manager.spec
+++ b/subscription-manager.spec
@@ -240,7 +240,7 @@
 %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk}
 
 Name: subscription-manager
-Version: 1.29.10
+Version: 1.29.11
 Release: 1%{?dist}
 Summary: Tools and libraries for subscription and repository management
 %if 0%{?suse_version}
@@ -1523,6 +1523,18 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Thu Apr 22 2021 William Poteat <wpoteat@redhat.com> 1.29.11-1
+- Add subscription-manager dependency to apt-katello-transport (kolb@atix.de)
+- 1898552: refactor/fix collection of IP v4/v6 address info
+  (ptoscano@redhat.com)
+- cockpit: Enable TLS for mock insights server (martin@piware.de)
+- adding timoeout to jenkins pipeline (#2585) (jmolet@redhat.com)
+- New extraction for translatable strings (ptoscano@redhat.com)
+- 1819555: cockpit: translate untranslatable messages (ptoscano@redhat.com)
+- Replace hardcoded errno value with constant (ptoscano@redhat.com)
+- 1940658: bash: complete also the syspurpose subcommand (ptoscano@redhat.com)
+- 1878736: use our i18n functions instead of dnf ones (ptoscano@redhat.com)
+
 * Tue Apr 13 2021 William Poteat <wpoteat@redhat.com> 1.29.10-1
 - Switch dates returned by D-Bus ListInstalledProducts to ISO 8601
   (ptoscano@redhat.com)
diff --git a/tests/smoke/smoke.sh b/tests/smoke/smoke.sh
new file mode 100755
index 0000000..e079638
--- /dev/null
+++ b/tests/smoke/smoke.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+
+while getopts ":c" opt; do
+  case $opt in
+    c) IN_CONTAINER=true;;
+    *) IN_CONTAINER=false;;
+  esac
+done 
+
+# takes in a command and makes sure that it returns success
+# and that nothing is sent to stderr
+function smoke {
+  echo -n "Smoke test: '$@': "
+  ERROR=$("$@" 2>&1> /dev/null)
+  RETVAL=$?
+  
+  if [ -z "$ERROR" ] && [[ $RETVAL == 0 ]]; then
+    echo "PASS"
+  else
+    echo "FAIL"
+    echo "RETVAL: $RETVAL"
+    echo "STDERR: $ERROR"
+    exit 1
+  fi
+}
+
+function smoke_container {
+  echo -n "Smoke Container test: '$@': "
+  ERROR=$("$@" 2>&1> /dev/null)
+  RETVAL=$?
+  
+  if [[ ! -z "$ERROR" ]] && [[ $RETVAL == 78 ]]; then
+    echo "PASS"
+  else
+    echo "FAIL"
+    echo "RETVAL: $RETVAL"
+    echo "STDERR: $ERROR"
+    exit 1
+  fi
+}
+
+SMOKE_CMDS="subscription-manager --help
+subscription-manager config
+subscription-manager facts
+subscription-manager list
+subscription-manager repos
+subscription-manager version"
+
+if [[ "$IN_CONTAINER" == "true" ]]; then
+  TEST_CMD="smoke_container"
+  SMOKE_CMDS="subscription-manager config
+subscription-manager facts
+subscription-manager list
+subscription-manager repos
+subscription-manager version"
+else
+  TEST_CMD="smoke"
+fi
+
+while read -r CMD; do
+  $TEST_CMD $CMD
+done <<<"$SMOKE_CMDS"
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..0160fec
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,21 @@
+---
+- hosts: localhost
+  tags:
+  - classic
+  - atomic
+  roles:
+  - role: standard-test-basic
+    tests:
+    - smoke:
+        dir: smoke
+        run: ./smoke.sh
+
+- hosts: localhost
+  tags:
+  - container
+  roles:
+  - role: standard-test-basic
+    tests:
+    - smoke:
+        dir: smoke
+        run: ./smoke.sh -c