Compare commits

..

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

11 changed files with 1296 additions and 1375 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/subscription-manager-1.28.42.tar.gz
/subscription-manager-*.tar.gz

View File

@ -0,0 +1 @@
79971108b37f2e6535b899f9dfb9fc61a5f1f1bd subscription-manager-1.29.40.tar.gz

View File

@ -1,32 +0,0 @@
diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in
--- subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in 2022-04-13 18:01:03.000000000 +0300
+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in 2022-05-10 19:54:57.000000000 +0300
@@ -1,5 +1,5 @@
[Desktop Entry]
-_Name=Red Hat Subscription Manager
+_Name=Subscription Manager
Icon=subscription-manager
Type=Application
TryExec=/usr/libexec/cockpit-desktop
diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in
--- subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in 2022-04-13 18:01:03.000000000 +0300
+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in 2022-05-10 19:55:18.000000000 +0300
@@ -1,5 +1,5 @@
[Desktop Entry]
-_Name=Red Hat Subscription Manager
+_Name=Subscription Manager
Icon=subscription-manager
Exec=subscription-manager-gui
Terminal=false
diff -aruN subscription-manager-1.28.29/src/subscription_manager/repolib.py subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py
--- subscription-manager-1.28.29/src/subscription_manager/repolib.py 2022-04-13 18:01:03.000000000 +0300
+++ subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py 2022-05-10 20:01:44.000000000 +0300
@@ -87,7 +87,7 @@
@staticmethod
def warning_message(enabled_yum_plugins):
message = _('The yum/dnf plugins: %s were automatically enabled for the benefit of '
- 'Red Hat Subscription Management. If not desired, use '
+ 'Subscription Management. If not desired, use '
'"subscription-manager config --rhsm.auto_enable_yum_plugins=0" to '
'block this behavior.') % ', '.join(enabled_yum_plugins)
return message

View File

@ -1,16 +0,0 @@
diff -Nurp subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py subscription-manager-1.27.11/src/subscription_manager/repofile.py
--- subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py 2020-07-28 11:06:10.000000000 -0500
+++ subscription-manager-1.27.11/src/subscription_manager/repofile.py 2020-08-05 16:48:00.911709258 -0500
@@ -368,11 +368,7 @@ class RepoFileBase(object):
Try to create new repo file.
:return: None
"""
- self.create_dir_path()
- if self.path_exists(self.path) or not self.manage_repos:
- return
- with open(self.path, 'w') as f:
- f.write(self.REPOFILE_HEADER)
+ pass
def fix_content(self, content):
return content

View File

@ -1,20 +0,0 @@
diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json
index 1ac7ea0e..305ec4b9 100644
--- a/etc-conf/syspurpose/valid_fields.json
+++ b/etc-conf/syspurpose/valid_fields.json
@@ -1,12 +1,10 @@
{
"role": [
- "Red Hat Enterprise Linux Server",
- "Red Hat Enterprise Linux Workstation",
- "Red Hat Enterprise Linux Compute Node"
+ "AlmaLinux Server",
+ "AlmaLinux Workstation",
+ "AlmaLinux Compute Node"
],
"service_level_agreement": [
- "Premium",
- "Standard",
"Self-Support"
],
"usage": [

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
- !PassingTestCaseRule {test_case_name: rhsmci.brew-build.tier1.functional}

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (subscription-manager-1.29.40.tar.gz) = efc4e529c327c24383129a6c05a80ccb7a04d6473f18ab964b1eeee89225bf68f7c4ec2d1b04123bcc30dee400c3a54f9fe478fc5093c72d1e186a73eb365bb6

View File

@ -0,0 +1,6 @@
# This seems ok to me
addFilter('invalid-url')
# Ignore failing suse specific checks
setBadness("suse-dbus-unauthorized-service", 0)
setBadness("polkit-unauthorized-privilege", 0)

File diff suppressed because it is too large Load Diff

63
tests/smoke/smoke.sh Executable file
View File

@ -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"

21
tests/tests.yml Normal file
View File

@ -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