Establish atix main

.cockpit-ci/run

@@ -1 +1 @@
-../integration-tests/run
+../cockpit-tests/run

.fmf/version

@@ -0,0 +1 @@
+1

.github/workflows/libdnf.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         include:
           - name: "CentOS Stream 10"
-            image: "quay.io/centos/centos:stream10-development"
+            image: "quay.io/centos/centos:stream10"
           - name: "Fedora latest"
             image: "registry.fedoraproject.org/fedora:latest"
           - name: "Fedora Rawhide"

.github/workflows/pytest.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         include:
           - name: "CentOS Stream 10"
-            image: "quay.io/centos/centos:stream10-development"
+            image: "quay.io/centos/centos:stream10"
             pytest_args: ''
           - name: "Fedora latest"
             image: "registry.fedoraproject.org/fedora:latest"

.github/workflows/tito.yml

@@ -12,9 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: "CentOS Stream 10"
-            image: "quay.io/centos/centos:stream10-development"
-            packager: "dnf4"
           - name: "Fedora latest"
             image: "registry.fedoraproject.org/fedora:latest"
             packager: "dnf4"

.packit.yml

@@ -0,0 +1,46 @@
+upstream_package_name: subscription-manager
+downstream_package_name: subscription-manager
+specfile_path: subscription-manager.spec
+upstream_tag_template: "subscription-manager-{version}-1"
+
+jobs:
+  - job: copr_build
+    trigger: pull_request
+    targets:
+      - centos-stream-10
+      - fedora-all
+
+  - job: copr_build
+    trigger: commit
+    branch: main
+    owner: "@yggdrasil"
+    project: latest
+    targets:
+      - centos-stream-10
+      - fedora-all
+
+#  - job: tests
+#    trigger: pull_request
+#    identifier: "unit/centos-stream"
+#    targets:
+#      - centos-stream-10
+#    labels:
+#      - unit
+#    tf_extra_params:
+#      environments:
+#        - artifacts:
+#            - type: repository-file
+#              id: https://copr.fedorainfracloud.org/coprs/g/yggdrasil/latest/repo/centos-stream-$releasever/group_yggdrasil-latest-centos-stream-$releasever.repo
+
+  - job: tests
+    trigger: pull_request
+    identifier: "unit/fedora"
+    targets:
+      - fedora-all
+    labels:
+      - unit
+    tf_extra_params:
+      environments:
+        - artifacts:
+            - type: repository-file
+              id: https://copr.fedorainfracloud.org/coprs/g/yggdrasil/latest/repo/fedora-$releasever/group_yggdrasil-latest-fedora-$releasever.repo

.tito/packages/subscription-manager

@@ -1 +1 @@
-1.29.40-1 ./
+1.30.3-1 ./

INSTALL.md

@@ -9,10 +9,17 @@ To install subscription-manager, run
 sudo dnf install subscription-manager
 ```
 
+RHEL already comes with `subscription-manager` pre-installed. With `subscription-manager` present, you can get register the system with your Red Hat account by running
+
+```bash
+sudo subscription-manager register
+```
+
+
 ## Developer installation
 
-The process below has been tested on Fedora 36.
-Other Fedora versions or distributions may require some adaptation.
+The process below has been tested on Fedora 36 and RHEL 9.
+Other versions or distributions may require some adaptation.
 
 1. First you need to install RPM packages to build and run subscription-manager binaries:
 
@@ -23,9 +30,15 @@ Other Fedora versions or distributions may require some adaptation.
 
    <!-- libdnf-devel, cmake are required to build product-id plugin -->
 
-2. Install Fedora's subscription-manager RPM and packages required to run the test suite:
+   On RHEL, you need to enable the [CodeReady Linux Builder](https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/package_manifest/repositories#CodeReadyLinuxBuilder-repository) repository in order to gain access to the development packages like `libdnf-devel`.
+
+   ```bash
+   sudo subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms
+   ```
+
+2. Install the `subscription-manager` RPM (not required for RHEL) and packages required to run the test suite:
 
-   ***NOTE**: Installing `subscription-manager` package is strictly not necessary, but it will pull down all dependencies and create all the files used by subscription-manager.*
+   ***NOTE**: Installing `subscription-manager` package is not strictly necessary even on Fedora, but it will pull down all dependencies and create all the files used by subscription-manager.*
 
    ```bash
    sudo dnf install --setopt install_weak_deps=False subscription-manager \
@@ -87,7 +100,7 @@ Other Fedora versions or distributions may require some adaptation.
    alias rhsmcertd="sudo \
        PYTHONPATH=/path/to/subscription-manager/src \
        $(which python3) \
-       -m subscription_manager.scripts.rhsmcertd_worker --autoheal"
+       -m subscription_manager.scripts.rhsmcertd_worker"
    ```
 
    Before you run rhsm service manually, ensure you have disabled the system service first:

Makefile

@@ -237,6 +237,10 @@ install-files: dbus-install install-conf install-plugins
 	install -m 644 etc-conf/subscription-manager.conf.tmpfiles \
 		$(DESTDIR)/$(PREFIX)/lib/tmpfiles.d/subscription-manager.conf
 
+	# Install configuration file with system users and group (only rhsm group ATM)
+	install -d $(DESTDIR)/$(PREFIX)/lib/sysusers.d
+	install -m 644 etc-conf/rhsm-sysuser.conf $(DESTDIR)/$(PREFIX)/lib/sysusers.d/rhsm.conf
+
 	# SUSE Linux does not make use of consolehelper
 	if [ -f /etc/redhat-release ]; then \
 		ln -sf /usr/bin/consolehelper $(DESTDIR)/$(PREFIX)/bin/subscription-manager; \

TESTING.md

@@ -2,6 +2,12 @@
 
 ## subscription-manager
 
+First, install the tests dependencies from [`test-requirements.txt`](test-requirements.txt). Make sure your virtual environment is activated.
+
+```bash
+pip install -r test-requirements.txt
+```
+
 ```bash
 pytest
 # or, for increased verbosity

integration-tests/run → cockpit-tests/run

@@ -6,8 +6,8 @@
 # like this:
 #
 # $ export TEST_OS=rhel-8-4
-# $ ./integration-tests/run prepare
-# $ ./integration-tests/check-subscriptions -v -j1 -t
+# $ ./cockpit-tests/run prepare
+# $ ./cockpit-tests/check-subscriptions -v -j1 -t
 #
 # You need a couple of things installed for that.  At least Python 3,
 # a Chromium browser, and libvirtd.  See
@@ -20,7 +20,7 @@ ifeq ($(TEST_OS),)
 TEST_OS = rhel-8-4
 endif
 export TEST_OS
-SUB_MAN_COCKPIT=$(CURDIR)/integration-tests/submancockpit
+SUB_MAN_COCKPIT=$(CURDIR)/cockpit-tests/submancockpit
 VM_IMAGE=$(SUB_MAN_COCKPIT)/test/images/$(TEST_OS).qcow2
 SUBMAN_TAR=$(CURDIR)/dist/subscription-manager.tar.gz
 SMBEXT_TAR=$(CURDIR)/dist/subscription-manager-build-extra.tar.gz
@@ -45,7 +45,7 @@ $(SUBMAN_TAR):
 $(SMBEXT_TAR):
 	tar czf $(SMBEXT_TAR) build_ext
 
-$(VM_IMAGE): $(SUB_MAN_COCKPIT) $(SUBMAN_TAR) $(SMBEXT_TAR) integration-tests/vm.install
+$(VM_IMAGE): $(SUB_MAN_COCKPIT) $(SUBMAN_TAR) $(SMBEXT_TAR) cockpit-tests/vm.install
 	rm -f $(VM_IMAGE)
 	# setup the test image from subscription-manager-cockpit without
 	# a custom subscription-manager, which will be installed manually
@@ -54,7 +54,7 @@ $(VM_IMAGE): $(SUB_MAN_COCKPIT) $(SUBMAN_TAR) $(SMBEXT_TAR) integration-tests/vm
 	cd $(SUB_MAN_COCKPIT) && bots/image-customize -v $(TEST_OS) \
           -u $(SUBMAN_TAR):/var/tmp/ \
           -u $(SMBEXT_TAR):/var/tmp/ \
-          -s ../../integration-tests/vm.install
+          -s ../../cockpit-tests/vm.install
 
 $(SUB_MAN_COCKPIT):
 	git clone --quiet https://github.com/candlepin/subscription-manager-cockpit.git $(SUB_MAN_COCKPIT)

debian-stuff/80package-profile-upload

@@ -1 +1 @@
-DPkg::Post-Invoke { /usr/lib/katello-client/bin/deb_package_profile_upload }
+DPkg::Post-Invoke { /usr/bin/package-profile-upload }

debian-stuff/katello

@@ -1,4 +1,4 @@
-#! /usr/bin/python -u
+#! /usr/bin/python3 -u
 #
 # The katello Acquire Method
 #
@@ -29,7 +29,7 @@ import re
 import hashlib
 import requests
 from urllib.parse import quote
-from configparser import SafeConfigParser
+from configparser import ConfigParser
 
 
 class pkg_acquire_method:
@@ -138,7 +138,7 @@ class katello_method(pkg_acquire_method):
         Return the proxy server config from /etc/rhsm/rhsm.conf as dict
         Adapted from https://github.com/Katello/katello-client-bootstrap/blob/master/bootstrap.py
         """
-        rhsmconfig = SafeConfigParser()
+        rhsmconfig = ConfigParser()
         rhsmconfig.read('/etc/rhsm/rhsm.conf')
 
         proxy_options = [option for option in rhsmconfig.options('server') if option.startswith('proxy')]

etc-conf/dbus/system.d/com.redhat.RHSM1.conf

@@ -14,9 +14,6 @@
         <allow send_destination="com.redhat.RHSM1"
             send_interface="com.redhat.RHSM1"/>
 
-        <allow send_destination="com.redhat.RHSM1"
-            send_interface="com.redhat.RHSM1.Attach"/>
-
         <allow send_destination="com.redhat.RHSM1"
             send_interface="com.redhat.RHSM1.Products"/>
 

etc-conf/rhsm-sysuser.conf

@@ -0,0 +1,2 @@
+#Type Name       ID                  GECOS              Home directory Shell
+g     rhsm       -                   -

etc-conf/rhsm.conf

@@ -87,8 +87,6 @@ progress_messages = 1
 [rhsmcertd]
 # Interval to run cert check (in minutes):
 certCheckInterval = 240
-# Interval to run auto-attach (in minutes):
-autoAttachInterval = 1440
 # If set to zero, the checks done by the rhsmcertd daemon will not be splayed (randomly offset)
 splay = 1
 # If set to 1, rhsmcertd will not execute.

etc-conf/rhsmcertd.completion.sh

@@ -11,7 +11,7 @@ _rhsmcertd()
 	first="${COMP_WORDS[1]}"
 	cur="${COMP_WORDS[COMP_CWORD]}"
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
-	opts="-h --help -c --cert-check-interval --cert-interval -d --debug --heal-interval -i --auto-attach-interval -n --now -s --no-splay -a --auto-registration -r --auto-registration-interval"
+	opts="-h --help -c --cert-check-interval -d --debug -n --now -s --no-splay -a --auto-registration -r --auto-registration-interval"
 
 	case "${cur}" in
 		-*)