Compare commits

..

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

13 changed files with 1491 additions and 1375 deletions

2
.gitignore vendored
View File

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

13
README.md Normal file
View File

@ -0,0 +1,13 @@
subscription-manager
====================
The Subscription Manager package provides programs and libraries
to allow users to manage subscriptions and yum/dnf repositories
from the [Candlepin](http://candlepinproject.org/) server.
- Project homepage: http://candlepinproject.org/
- Upstream repository: https://github.com/candlepin/subscription-Manager
## Contribution Guidelines
If you want to do any changes to `subscription-manager.spec`, then please create pull request with same/similar change to upstream repository, because upstream repository manages its own .spec file. If the change would not be contributed to upstream repository, then there is risk that the change provided here could be reverted later by upstream.

3
README.packit Normal file
View File

@ -0,0 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 0.88.0.post1.dev4+gc070191b.

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": [

47
almalinux_debrand.patch Normal file
View File

@ -0,0 +1,47 @@
diff -aruN subscription-manager-1.29.37/etc-conf/syspurpose/valid_fields.json subscription-manager-1.29.37.alma/etc-conf/syspurpose/valid_fields.json
--- subscription-manager-1.29.37/etc-conf/syspurpose/valid_fields.json 2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/etc-conf/syspurpose/valid_fields.json 2023-10-09 23:38:40
@@ -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": [
diff -aruN subscription-manager-1.29.37/src/subscription_manager/repofile.py subscription-manager-1.29.37.alma/src/subscription_manager/repofile.py
--- subscription-manager-1.29.37/src/subscription_manager/repofile.py 2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/src/subscription_manager/repofile.py 2023-10-09 23:38:48
@@ -375,11 +375,7 @@
"""
Try to create new repo file.
"""
- 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: str) -> str:
return content
diff -aruN subscription-manager-1.29.37/src/subscription_manager/repolib.py subscription-manager-1.29.37.alma/src/subscription_manager/repolib.py
--- subscription-manager-1.29.37/src/subscription_manager/repolib.py 2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/src/subscription_manager/repolib.py 2023-10-09 23:38:57
@@ -92,7 +92,7 @@
def warning_message(enabled_yum_plugins: List[str]) -> str:
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)

7
gating.yaml Normal file
View File

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

28
packit.yaml Normal file
View File

@ -0,0 +1,28 @@
upstream_project_url: https://github.com/candlepin/subscription-manager
srpm_build_deps:
- python3
- tito
actions:
pre-sync:
- tito build -o . --tgz
specfile_path: subscription-manager.spec
files_to_sync:
- src:
- subscription-manager.spec
- "subscription-manager-*.tar.gz"
dest: .
upstream_tag_template: "subscription-manager-{version}-1"
jobs:
- job: pull_from_upstream
trigger: release
dist_git_branches:
- fedora-all
- job: koji_build
trigger: commit
dist_git_branches:
- fedora-all
- job: bodhi_update
trigger: commit
dist_git_branches:
- fedora-branched
- fedora-stable

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (subscription-manager-1.30.2.tar.gz) = f59ecd60bc67aea0fcb1e75d31c62500127ad65bf511abf205faab2ec11e5ab7b298a26f785b0973fd26183d03a86ff72c2a1e05881a67b02052bcc171ba3cc4

File diff suppressed because it is too large Load Diff

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

@ -0,0 +1,61 @@
#!/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 repos
subscription-manager version"
if [[ "$IN_CONTAINER" == "true" ]]; then
TEST_CMD="smoke_container"
SMOKE_CMDS="subscription-manager config
subscription-manager facts
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