Merge remote-tracking branch 'upstream/main'

Author: m-rafeeq

.github/workflows/build-notebooks-pr-aipcc.yaml

@@ -89,5 +89,6 @@ jobs:
       python: "${{ matrix.python }}"
       github: "${{ toJSON(github) }}"
       platform: "${{ matrix.platform }}"
-      subscription: "${{ matrix.subscription }}"
+      # rhds/notebooks builds from AIPCC base images that are RHEL-based
+      subscription: "true"
     secrets: inherit

.github/workflows/build-notebooks-push.yaml

@@ -53,5 +53,6 @@ jobs:
       python: "${{ matrix.python }}"
       github: "${{ toJSON(github) }}"
       platform: "${{ matrix.platform }}"
-      subscription: "${{ matrix.subscription }}"
+      # rhds/notebooks builds from AIPCC base images that are RHEL-based
+      subscription: "${{ matrix.subscription || (github.repository == 'red-hat-data-services/notebooks') }}"
     secrets: inherit