Merge pull request #1 from redhat-cop/subscription-manager-manage

subscription-manager Management and update on GH action to not run semantic release on other branches.

Author: shebistar

.github/workflows/build-ee.yml

@@ -103,13 +103,14 @@ jobs:
   #   steps:
   #     - uses: actions/checkout@v4
   #       with:
-  #         fetch-depth: 0          
+  #         fetch-depth: 0
   #     - name: Python Semantic Release
   #       uses: python-semantic-release/python-semantic-release@v9.15.0
   #       with:
   #         github_token: ${{ secrets.GITHUB_TOKEN }}
   release:
     needs: build-and-push
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     concurrency:
       group: ${{ github.workflow }}-release-${{ github.ref_name }}
@@ -126,9 +127,9 @@ jobs:
       # while the workflow was running, which prevents accidentally releasing un-evaluated
       # changes.
       - name: Setup | Checkout Repository on Release Branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
-          ref: ${{ github.ref_name }}
+          fetch-depth: 0
 
       - name: Setup | Force release branch to be at workflow sha
         run: |

openshift-virtualization-migration-ee-2.4/bindep.txt

@@ -0,0 +1,4 @@
+# System dependencies for building EEs
+gcc [platform:rpm]
+systemd-devel [platform:rpm]
+python3.12-devel [platform:rpm]

openshift-virtualization-migration-ee-2.4/execution-environment.yml

@@ -6,8 +6,12 @@ images:
 options:
   package_manager_path: /usr/bin/microdnf
 dependencies:
+  system: bindep.txt
+  python_interpreter:
+    package_system: python3.12
+    python_path: /usr/bin/python3.12
   ansible_core:
-    package_pip: ansible-core>=2.15.0rc2,<2.16
+    package_pip: ansible-core>=2.16
   ansible_runner:
     package_pip: ansible-runner
   galaxy: requirements.yml
@@ -17,16 +21,14 @@ additional_build_steps:
   prepend_base:
     - ARG REDHAT_ORG
     - ARG REDHAT_ACTIVATION_KEY
-    # FIX 1: Install subscription-manager AND python3-pip
-    - RUN microdnf install -y subscription-manager python3-pip
-    - RUN subscription-manager register --org $REDHAT_ORG --activationkey $REDHAT_ACTIVATION_KEY
-    - RUN $PKGMGR -y remove python3-typing-extensions python3-black python3-jsonschema ansible-lint || true
-    - RUN $PYCMD -m pip install -U pip setuptools
-  
-  # FIX 2: Restore repo enablement so packages can be found
+    - RUN if [[ ! -z "$REDHAT_ORG" ]] && [[ ! -z "$REDHAT_ACTIVATION_KEY" ]]; then microdnf install -y subscription-manager && subscription-manager register --org $REDHAT_ORG --activationkey $REDHAT_ACTIVATION_KEY; else echo "Skipping Subscribing Build"; fi
+    # The fix for rpds-py is included here:
+    - RUN $PKGMGR -y remove python3.12-typing-extensions python3.12-referencing python3.12-jsonschema python3.12-rpds-py python3.12-ansible-compat python3.12-jsonschema-specifications ansible-lint || true
+    - RUN $PYCMD -m pip install --upgrade pip setuptools
+
   prepend_builder:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.17-for-rhel-9-*-rpms"
-  
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
+
   prepend_galaxy:
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_URL
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_AUTH_URL
@@ -37,12 +39,10 @@ additional_build_steps:
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_CERTIFIED_TOKEN
     - ARG ANSIBLE_GALAXY_SERVER_UPSTREAM_GALAXY_URL
     - ARG ANSIBLE_GALAXY_SERVER_LIST
-  
-  # FIX 3: Restore repo enablement for the final stage
+
   prepend_final:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.17-for-rhel-9-*-rpms"
-  
-  append_base:
-    - RUN $PYCMD -m pip install -U pip
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
+
   append_final:
-    - RUN subscription-manager unregister
+    - RUN ln -sf /usr/bin/python3.12 /usr/bin/python3
+    - RUN if [[ ! -z "$REDHAT_ORG" ]] && [[ ! -z "$REDHAT_ACTIVATION_KEY" ]]; then subscription-manager unregister || true; else echo "Skipping Unregistering Build"; fi

openshift-virtualization-migration-ee-2.4/requirements.txt

@@ -2,4 +2,5 @@ omsdk >= 1.2.490
 kubernetes >= 12.0.0
 PyYAML >= 3.11
 aiohttp
-jsonpatch
+jmespath
+jsonpatch

openshift-virtualization-migration-ee-2.5/bindep.txt

@@ -1,4 +1,4 @@
 # System dependencies for building EEs
 gcc [platform:rpm]
 systemd-devel [platform:rpm]
-python3.11-devel [platform:rpm]
+python3.12-devel [platform:rpm]

openshift-virtualization-migration-ee-2.5/execution-environment.yml

@@ -8,8 +8,8 @@ options:
 dependencies:
   system: bindep.txt
   python_interpreter:
-    package_system: python3.11
-    python_path: /usr/bin/python3.11
+    package_system: python3.12
+    python_path: /usr/bin/python3.12
   ansible_core:
     package_pip: ansible-core>=2.16
   ansible_runner:
@@ -21,14 +21,13 @@ additional_build_steps:
   prepend_base:
     - ARG REDHAT_ORG
     - ARG REDHAT_ACTIVATION_KEY
-    - RUN microdnf install -y subscription-manager
-    - RUN subscription-manager register --org $REDHAT_ORG --activationkey $REDHAT_ACTIVATION_KEY
+    - RUN if [[ ! -z "$REDHAT_ORG" ]] && [[ ! -z "$REDHAT_ACTIVATION_KEY" ]]; then microdnf install -y subscription-manager && subscription-manager register --org $REDHAT_ORG --activationkey $REDHAT_ACTIVATION_KEY; else echo "Skipping Subscribing Build"; fi
     # The fix for rpds-py is included here:
-    - RUN $PKGMGR -y remove python3.11-typing-extensions python3.11-referencing python3.11-jsonschema python3.11-rpds-py python3.11-ansible-compat python3.11-jsonschema-specifications ansible-lint || true
+    - RUN $PKGMGR -y remove python3.12-typing-extensions python3.12-referencing python3.12-jsonschema python3.12-rpds-py python3.12-ansible-compat python3.12-jsonschema-specifications ansible-lint || true
     - RUN $PYCMD -m pip install --upgrade pip setuptools
 
   prepend_builder:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.17-for-rhel-9-*-rpms"
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
 
   prepend_galaxy:
     - ARG ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_VALIDATED_URL
@@ -42,8 +41,8 @@ additional_build_steps:
     - ARG ANSIBLE_GALAXY_SERVER_LIST
 
   prepend_final:
-    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.17-for-rhel-9-*-rpms"
+    - ENV PKGMGR_OPTS "--nodocs --setopt install_weak_deps=0 --enablerepo=rhocp-4.21-for-rhel-9-*-rpms"
 
   append_final:
-    - RUN ln -sf /usr/bin/python3.11 /usr/bin/python3
-    - RUN subscription-manager unregister || true
+    - RUN ln -sf /usr/bin/python3.12 /usr/bin/python3
+    - RUN if [[ ! -z "$REDHAT_ORG" ]] && [[ ! -z "$REDHAT_ACTIVATION_KEY" ]]; then subscription-manager unregister || true; else echo "Skipping Unregistering Build"; fi