diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index bad75f3bb..360c1c6a6 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -9,12 +9,18 @@ ADD ./{{ item.name }} ./{{ item.name }}
 # S3 botocore needs to be patched to handle responses from minio during 0-byte uploads
 # Hacking botocore (https://github.com/boto/botocore/pull/1990)
 
-RUN pip3 install
+# This MUST be the ONLY call to pip install in inside the container.
+RUN pip3 install --upgrade pip setuptools wheel && \
+  rm -rf /root/.cache/pip && \
+  pip3 install pipdeptree
 {%- if s3_test | default(false) -%}
 {{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue
 {%- endif -%}
 {%- for item in plugins -%}
 {{ " " }}{{ item.source }}
+{%- if item.upperbounds | default(false) -%}
+{{ " " }}-c ./{{ item.name }}/upperbounds_constraints.txt
+{%- endif -%}
 {%- if item.lowerbounds | default(false) -%}
 {{ " " }}-c ./{{ item.name }}/lowerbounds_constraints.txt
 {%- endif -%}
@@ -22,7 +28,8 @@ RUN pip3 install
 {{ " " }}-r ./{{ item.name }}/ci_requirements.txt
 {%- endif -%}
 {%- endfor %}
-{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt
+{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \
+  rm -rf /root/.cache/pip
 
 {% if pulp_env is defined and pulp_env %}
 {% for key, value in pulp_env.items() %}
diff --git a/.ci/scripts/calc_constraints.py b/.ci/scripts/calc_constraints.py
new file mode 100755
index 000000000..b5be1b1f5
--- /dev/null
+++ b/.ci/scripts/calc_constraints.py
@@ -0,0 +1,118 @@
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --github pulp_rpm' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
+import argparse
+import fileinput
+import urllib.request
+import sys
+from packaging.requirements import Requirement
+from packaging.version import Version
+import yaml
+
+
+CORE_TEMPLATE_URL = "https://raw.githubusercontent.com/pulp/pulpcore/main/template_config.yml"
+
+
+def fetch_pulpcore_upper_bound(requirement):
+    with urllib.request.urlopen(CORE_TEMPLATE_URL) as f:
+        template = yaml.safe_load(f.read())
+    supported_versions = template["supported_release_branches"]
+    supported_versions.append(template["latest_release_branch"])
+    applicable_versions = sorted(
+        requirement.specifier.filter((Version(v) for v in supported_versions))
+    )
+    if len(applicable_versions) == 0:
+        raise Exception("No supported pulpcore version in required range.")
+    return f"{requirement.name}~={applicable_versions[-1]}"
+
+
+def split_comment(line):
+    split_line = line.split("#", maxsplit=1)
+    try:
+        comment = "  # " + split_line[1].strip()
+    except IndexError:
+        comment = ""
+    return split_line[0].strip(), comment
+
+
+def to_upper_bound(req):
+    try:
+        requirement = Requirement(req)
+    except ValueError:
+        return f"# UNPARSABLE: {req}"
+    else:
+        if requirement.name == "pulpcore":
+            # An exception to allow for pulpcore deprecation policy.
+            return fetch_pulpcore_upper_bound(requirement)
+        for spec in requirement.specifier:
+            if spec.operator == "~=":
+                return f"# NO BETTER CONSTRAINT: {req}"
+            if spec.operator == "<=":
+                operator = "=="
+                max_version = spec.version
+                return f"{requirement.name}{operator}{max_version}"
+            if spec.operator == "<":
+                operator = "~="
+                version = Version(spec.version)
+                if version.micro != 0:
+                    max_version = f"{version.major}.{version.minor}.{version.micro-1}"
+                elif version.minor != 0:
+                    max_version = f"{version.major}.{version.minor-1}"
+                elif version.major != 0:
+                    max_version = f"{version.major-1}.0"
+                else:
+                    return f"# NO BETTER CONSTRAINT: {req}"
+                return f"{requirement.name}{operator}{max_version}"
+        return f"# NO UPPER BOUND: {req}"
+
+
+def to_lower_bound(req):
+    try:
+        requirement = Requirement(req)
+    except ValueError:
+        return f"# UNPARSABLE: {req}"
+    else:
+        for spec in requirement.specifier:
+            if spec.operator == ">=":
+                if requirement.name == "pulpcore":
+                    # Currently an exception to allow for pulpcore bugfix releases.
+                    # TODO Semver libraries should be allowed too.
+                    operator = "~="
+                else:
+                    operator = "=="
+                min_version = spec.version
+                return f"{requirement.name}{operator}{min_version}"
+        return f"# NO LOWER BOUND: {req}"
+
+
+def main():
+    """Calculate constraints for the lower bound of dependencies where possible."""
+    parser = argparse.ArgumentParser(
+        prog=sys.argv[0],
+        description="Calculate constraints for the lower or upper bound of dependencies where "
+        "possible.",
+    )
+    parser.add_argument("-u", "--upper", action="store_true")
+    parser.add_argument("filename", nargs="*")
+    args = parser.parse_args()
+
+    with fileinput.input(files=args.filename) as req_file:
+        for line in req_file:
+            if line.strip().startswith("#"):
+                # Shortcut comment only lines
+                print(line.strip())
+            else:
+                req, comment = split_comment(line)
+                if args.upper:
+                    new_req = to_upper_bound(req)
+                else:
+                    new_req = to_lower_bound(req)
+                print(new_req + comment)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.ci/scripts/calc_deps_lowerbounds.py b/.ci/scripts/calc_deps_lowerbounds.py
deleted file mode 100755
index 75f7ee904..000000000
--- a/.ci/scripts/calc_deps_lowerbounds.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_rpm' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-
-from packaging.requirements import Requirement
-
-
-def main():
-    """Calculate the lower bound of dependencies where possible."""
-    with open("requirements.txt") as req_file:
-        for line in req_file:
-            try:
-                requirement = Requirement(line)
-            except ValueError:
-                print(line.strip())
-            else:
-                for spec in requirement.specifier:
-                    if spec.operator == ">=":
-                        if requirement.name == "pulpcore":
-                            operator = "~="
-                        else:
-                            operator = "=="
-                        min_version = str(spec)[2:]
-                        print(f"{requirement.name}{operator}{min_version}")
-                        break
-                else:
-                    print(line.strip())
-
-
-if __name__ == "__main__":
-    main()
diff --git a/.ci/scripts/collect_changes.py b/.ci/scripts/collect_changes.py
index 4e40efc11..7b6d60299 100755
--- a/.ci/scripts/collect_changes.py
+++ b/.ci/scripts/collect_changes.py
@@ -103,7 +103,7 @@ def main():
             for change in main_changes:
                 fp.write(change[1])
 
-        repo.git.commit("-m", "Update Changelog", "-m" "[noissue]", CHANGELOG_FILE)
+        repo.git.commit("-m", "Update Changelog", CHANGELOG_FILE)
 
 
 if __name__ == "__main__":
diff --git a/.ci/scripts/pr_labels.py b/.ci/scripts/pr_labels.py
new file mode 100755
index 000000000..9d637b6b2
--- /dev/null
+++ b/.ci/scripts/pr_labels.py
@@ -0,0 +1,57 @@
+#!/bin/env python3
+
+# This script is running with elevated privileges from the main branch against pull requests.
+
+import re
+import sys
+import tomllib
+from pathlib import Path
+
+from git import Repo
+
+
+def main():
+    assert len(sys.argv) == 3
+
+    with open("pyproject.toml", "rb") as fp:
+        PYPROJECT_TOML = tomllib.load(fp)
+    BLOCKING_REGEX = re.compile(r"DRAFT|WIP|NO\s*MERGE|DO\s*NOT\s*MERGE|EXPERIMENT")
+    ISSUE_REGEX = re.compile(r"(?:fixes|closes)[\s:]+#(\d+)")
+    CHERRY_PICK_REGEX = re.compile(r"^\s*\(cherry picked from commit [0-9a-f]*\)\s*$")
+    CHANGELOG_EXTS = [
+        f".{item['directory']}" for item in PYPROJECT_TOML["tool"]["towncrier"]["type"]
+    ]
+
+    repo = Repo(".")
+
+    base_commit = repo.commit(sys.argv[1])
+    head_commit = repo.commit(sys.argv[2])
+
+    pr_commits = list(repo.iter_commits(f"{base_commit}..{head_commit}"))
+
+    labels = {
+        "multi-commit": len(pr_commits) > 1,
+        "cherry-pick": False,
+        "no-issue": False,
+        "no-changelog": False,
+        "wip": False,
+    }
+    for commit in pr_commits:
+        labels["wip"] |= BLOCKING_REGEX.search(commit.summary) is not None
+        no_issue = ISSUE_REGEX.search(commit.message, re.IGNORECASE) is None
+        labels["no-issue"] |= no_issue
+        cherry_pick = CHERRY_PICK_REGEX.search(commit.message) is not None
+        labels["cherry-pick"] |= cherry_pick
+        changelog_snippets = [
+            k
+            for k in commit.stats.files
+            if k.startswith("CHANGES/") and Path(k).suffix in CHANGELOG_EXTS
+        ]
+        labels["no-changelog"] |= not changelog_snippets
+
+    print("ADD_LABELS=" + ",".join((k for k, v in labels.items() if v)))
+    print("REMOVE_LABELS=" + ",".join((k for k, v in labels.items() if not v)))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.ci/scripts/validate_commit_message.py b/.ci/scripts/validate_commit_message.py
index 8786bea4d..71d5a9c8d 100755
--- a/.ci/scripts/validate_commit_message.py
+++ b/.ci/scripts/validate_commit_message.py
@@ -9,21 +9,16 @@
 import sys
 from pathlib import Path
 import subprocess
-
-
 import os
 import warnings
 from github import Github
 
-
-NO_ISSUE = "[noissue]"
 CHANGELOG_EXTS = [".feature", ".bugfix", ".doc", ".removal", ".misc", ".deprecation"]
+KEYWORDS = ["fixes", "closes"]
+
 sha = sys.argv[1]
 message = subprocess.check_output(["git", "log", "--format=%B", "-n 1", sha]).decode("utf-8")
 
-
-KEYWORDS = ["fixes", "closes"]
-
 g = Github(os.environ.get("GITHUB_TOKEN"))
 repo = g.get_repo("pulp/pulp_rpm")
 
@@ -64,15 +59,5 @@ def __check_changelog(issue):
     for issue in pattern.findall(message):
         __check_status(issue)
         __check_changelog(issue)
-else:
-    if NO_ISSUE in message:
-        print("Commit {sha} has no issues but is tagged {tag}.".format(sha=sha[0:7], tag=NO_ISSUE))
-    elif "Merge" in message and "cherry picked from commit" in message:
-        pass
-    else:
-        sys.exit(
-            "Error: no attached issues found for {sha}. If this was intentional, add "
-            " '{tag}' to the commit message.".format(sha=sha[0:7], tag=NO_ISSUE)
-        )
 
 print("Commit message for {sha} passed.".format(sha=sha[0:7]))
diff --git a/.github/template_gitref b/.github/template_gitref
index 19b4c781c..54bb08e8e 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-349-gba81617
+2021.08.26-382-gc88324b
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
deleted file mode 100644
index 38c05d228..000000000
--- a/.github/workflows/changelog.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_rpm' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-
----
-name: "Rpm changelog update"
-on:
-  push:
-    branches:
-      - "main"
-    paths:
-      - "CHANGES.rst"
-      - "CHANGES.md"
-  workflow_dispatch:
-
-jobs:
-
-  update-changelog:
-    runs-on: "ubuntu-latest"
-    strategy:
-      fail-fast: false
-
-    steps:
-      - uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 1
-
-      - uses: "actions/setup-python@v5"
-        with:
-          python-version: "3.11"
-
-      - name: "Install python dependencies"
-        run: |
-          echo ::group::PYDEPS
-          pip install -r doc_requirements.txt
-          echo ::endgroup::
-
-      - name: "Fake api schema"
-        run: |
-          mkdir -p docs/_build/html
-          echo "{}" > docs/_build/html/api.json
-          mkdir -p docs/_static
-          echo "{}" > docs/_static/api.json
-      - name: "Build Docs"
-        run: |
-          make diagrams html
-        working-directory: "./docs"
-        env:
-          PULP_CONTENT_ORIGIN: "http://localhost/"
-
-      - name: "Publish changlog to pulpproject.org"
-        run: |
-          .github/workflows/scripts/publish_docs.sh changelog ${GITHUB_REF##*/}
-        env:
-          PULP_DOCS_KEY: "${{ secrets.PULP_DOCS_KEY }}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f9d441172..b9c0c6a22 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,6 +46,9 @@ jobs:
         run: |
           python .ci/scripts/check_requirements.py
 
+  docs:
+    uses: "./.github/workflows/docs.yml"
+
   lint:
     uses: "./.github/workflows/lint.yml"
 
@@ -84,6 +87,7 @@ jobs:
       - "check-commits"
       - "lint"
       - "test"
+      - "docs"
     if: "always()"
     steps:
       - name: "Collect needed jobs results"
diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml
index faa6a389c..8de516d29 100644
--- a/.github/workflows/create-branch.yml
+++ b/.github/workflows/create-branch.yml
@@ -26,6 +26,12 @@ jobs:
           fetch-depth: 0
           path: "pulp_rpm"
 
+      - uses: "actions/checkout@v4"
+        with:
+          fetch-depth: 1
+          repository: "pulp/plugin_template"
+          path: "plugin_template"
+
       - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
@@ -33,7 +39,7 @@ jobs:
       - name: "Install python dependencies"
         run: |
           echo ::group::PYDEPS
-          pip install bump2version jinja2 pyyaml packaging
+          pip install bump2version packaging -r plugin_template/requirements.txt
           echo ::endgroup::
 
       - name: "Setting secrets"
@@ -71,13 +77,6 @@ jobs:
         run: |
           find CHANGES -type f -regex ".*\.\(bugfix\|doc\|feature\|misc\|deprecation\|removal\)" -exec git rm {} +
 
-      - name: Checkout plugin template
-        uses: actions/checkout@v4
-        with:
-          repository: pulp/plugin_template
-          path: plugin_template
-          fetch-depth: 0
-
       - name: Update CI branches in template_config
         working-directory: plugin_template
         run: |
@@ -94,10 +93,8 @@ jobs:
           branch: minor-version-bump
           base: main
           title: Bump minor version
-          body: '[noissue]'
           commit-message: |
             Bump minor version
-            [noissue]
           delete-branch: true
 
       - name: Push release branch
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 000000000..72e0846f6
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,54 @@
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --github pulp_rpm' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
+
+---
+name: "Docs"
+on:
+  workflow_call:
+
+jobs:
+  test:
+    if: "endsWith(github.base_ref, 'main')"
+    runs-on: "ubuntu-20.04"
+    defaults:
+      run:
+        working-directory: "pulp_rpm"
+    steps:
+      - uses: "actions/checkout@v4"
+        with:
+          fetch-depth: 1
+          path: "pulp_rpm"
+      - uses: "actions/setup-python@v5"
+        with:
+          python-version: "3.11"
+      - name: "Setup cache key"
+        run: |
+          git ls-remote https://github.com/pulp/pulp-docs main | tee pulp-docs-main-sha
+      - uses: "actions/cache@v4"
+        with:
+          path: "~/.cache/pip"
+          key: ${{ runner.os }}-pip-${{ hashFiles('pulp-docs-main-sha') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: "Install python dependencies"
+        run: |
+          echo ::group::PYDEPS
+          pip install -r doc_requirements.txt
+          echo ::endgroup::
+      - name: "Build changelog"
+        run: |
+          towncrier build --yes --version 4.0.0.ci
+      - name: "Build docs"
+        run: |
+          pulp-docs build
+
+  no-test:
+    if: "!endsWith(github.base_ref, 'main')"
+    runs-on: "ubuntu-20.04"
+    steps:
+      - run: |
+          echo "Skip docs testing on non-main branches."
diff --git a/.github/workflows/kanban.yml b/.github/workflows/kanban.yml
deleted file mode 100644
index f359cd343..000000000
--- a/.github/workflows/kanban.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_rpm' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-# Manage issues in a project board using https://github.com/leonsteinhaeuser/project-beta-automations
-
----
-name: Kanban
-on:
-  pull_request_target:
-  issues:
-    types:
-      - labeled
-      - reopened
-      - assigned
-      - closed
-
-env:
-  free_to_take: Free to take
-  in_progress: In Progress
-  needs_review: Needs review
-  done: Done
-
-jobs:
-  # only prio-list labeled items should be added to the board
-  add-to-project-board:
-    if: github.event_name == 'issues' && contains(github.event.issue.labels.*.name, 'prio-list') && contains(fromJson('["labeled", "reopened"]'), github.event.action)
-    runs-on: ubuntu-latest
-    steps:
-      - name: Add issue to Free-to-take list
-        uses: leonsteinhaeuser/project-beta-automations@v2.0.0
-        with:
-          gh_token: ${{ secrets.RELEASE_TOKEN }}
-          organization: pulp
-          project_id: 8
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: status
-          status_value: ${{ env.free_to_take }} # Target status
-
-  move-to-inprogress:
-    if: github.event_name == 'issues' && github.event.action == 'assigned'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Move an issue to the In Progress column
-        uses: leonsteinhaeuser/project-beta-automations@v2.0.0
-        with:
-          gh_token: ${{ secrets.RELEASE_TOKEN }}
-          organization: pulp
-          project_id: 8
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: status
-          status_value: ${{ env.in_progress }} # Target status
-
-  find-linked-issues:
-    if: github.event_name == 'pull_request_target'
-    runs-on: ubuntu-latest
-    name: Find issues linked to a PR
-    outputs:
-      linked-issues: ${{ steps.linked-issues.outputs.issues }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Get Linked Issues Action
-        uses: kin/gh-action-get-linked-issues@v1.0
-        id: linked-issues
-        with:
-          access-token: ${{ secrets.RELEASE_TOKEN }}
-
-  move-to-needs-review:
-    if: github.event_name == 'pull_request_target' && contains(fromJson(needs.find-linked-issues.outputs.linked-issues).*.issue.state, 'open')
-    runs-on: ubuntu-latest
-    name: Move linked issues to Needs Review
-    needs: find-linked-issues
-    strategy:
-      max-parallel: 3
-      matrix:
-        issues: ${{ fromJSON(needs.find-linked-issues.outputs.linked-issues) }}
-    steps:
-      - name: Move to Needs Review
-        uses: leonsteinhaeuser/project-beta-automations@v2.0.0
-        with:
-          gh_token: ${{ secrets.RELEASE_TOKEN }}
-          organization: pulp
-          project_id: 8
-          resource_node_id: ${{ matrix.issues.issue.node_id }}
-          operation_mode: status
-          status_value: ${{ env.needs_review }} # Target status
-
-  move-to-done:
-    if: github.event_name == 'issues' && github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Move an issue to the Done column
-        uses: leonsteinhaeuser/project-beta-automations@v2.0.0
-        with:
-          gh_token: ${{ secrets.RELEASE_TOKEN }}
-          organization: pulp
-          project_id: 8
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: status
-          status_value: ${{ env.done }} # Target status
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 550e6ab49..3c4933ee3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -66,58 +66,6 @@ jobs:
           delete-branch: true
           path: "pulp_rpm"
 
-  publish:
-    runs-on: ubuntu-latest
-    needs: test
-
-    steps:
-      - uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 1
-          path: "pulp_rpm"
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: "plugin_package"
-          path: "pulp_rpm/dist/"
-
-      - uses: "actions/setup-python@v5"
-        with:
-          python-version: "3.11"
-
-      - name: "Install python dependencies"
-        run: |
-          echo ::group::PYDEPS
-          pip install requests 'packaging~=21.3' mkdocs pymdown-extensions 'Jinja2<3.1'
-          echo ::endgroup::
-
-      - name: "Set environment variables"
-        run: |
-          echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV
-
-      - name: Download built docs
-        uses: actions/download-artifact@v4
-        with:
-          name: "docs.tar"
-          path: "pulp_rpm"
-
-      - name: Download Python client docs
-        uses: actions/download-artifact@v4
-        with:
-          name: "python-client-docs.tar"
-          path: "pulp_rpm"
-
-      - name: "Setting secrets"
-        run: |
-          python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
-        env:
-          SECRETS_CONTEXT: "${{ toJson(secrets) }}"
-
-      - name: Publish docs to pulpproject.org
-        run: |
-          tar -xvf docs.tar -C ./docs
-          .github/workflows/scripts/publish_docs.sh nightly ${GITHUB_REF##*/}
-
   performance:
     runs-on: ubuntu-latest
     needs: test
@@ -150,6 +98,26 @@ jobs:
           name: "plugin_package"
           path: "pulp_rpm/dist/"
 
+      - name: "Download API specs"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "api_spec"
+          path: "pulp_rpm/"
+
+      - name: "Download client packages"
+        uses: "actions/download-artifact@v4"
+        with:
+          name: "python-client.tar"
+          path: "pulp_rpm"
+
+      - name: "Unpack client packages"
+        working-directory: "pulp-openapi-generator"
+        run: |
+          mkdir -p "pulp_rpm-client"
+          pushd "pulp_rpm-client"
+          tar xvf "../../pulp_rpm/rpm-python-client.tar"
+          popd
+
       - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
index e6101a00b..f71f0dc89 100644
--- a/.github/workflows/pr_checks.yml
+++ b/.github/workflows/pr_checks.yml
@@ -6,57 +6,62 @@
 # For more info visit https://github.com/pulp/plugin_template
 
 ---
-name: Rpm PR static checks
+name: "Rpm PR static checks"
 on:
   pull_request_target:
-    types: [opened, synchronize, reopened]
+    types: ["opened", "synchronize", "reopened"]
 
 # This workflow runs with elevated permissions.
 # Do not even think about running a single bit of code from the PR.
 # Static analysis should be fine however.
 
 concurrency:
-  group: ${{ github.event.pull_request.number }}-${{ github.workflow }}
+  group: "${{ github.event.pull_request.number }}-${{ github.workflow }}"
   cancel-in-progress: true
 
 jobs:
-  single_commit:
-    runs-on: ubuntu-latest
-    name: Label multiple commit PR
+  apply_labels:
+    runs-on: "ubuntu-latest"
+    name: "Label PR"
     permissions:
-      pull-requests: write
+      pull-requests: "write"
     steps:
       - uses: "actions/checkout@v4"
         with:
           fetch-depth: 0
-      - name: Commit Count Check
+      - uses: "actions/setup-python@v5"
+        with:
+          python-version: "3.11"
+      - name: "Determine PR labels"
         run: |
+          pip install GitPython==3.1.42
           git fetch origin ${{ github.event.pull_request.head.sha }}
-          echo "COMMIT_COUNT=$(git log  --oneline --no-merges origin/${{ github.base_ref }}..${{ github.event.pull_request.head.sha }} | wc -l)" >> "$GITHUB_ENV"
-      - uses: actions/github-script@v7
+          python .ci/scripts/pr_labels.py "origin/${{ github.base_ref }}" "${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
+      - uses: "actions/github-script@v7"
+        name: "Apply PR Labels"
         with:
           script: |
-            const labelName = "multi-commit";
-            const { COMMIT_COUNT } = process.env;
+            const { ADD_LABELS, REMOVE_LABELS } = process.env;
 
-            if (COMMIT_COUNT == 1)
-            {
-              try {
-                await github.rest.issues.removeLabel({
-                  issue_number: context.issue.number,
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  name: labelName,
-                });
-              } catch(err) {
+            if (REMOVE_LABELS.length) {
+              for await (const labelName of REMOVE_LABELS.split(",")) {
+                try {
+                  await github.rest.issues.removeLabel({
+                    issue_number: context.issue.number,
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    name: labelName,
+                  });
+                } catch(err) {
+                }
               }
             }
-            else
-            {
+            if (ADD_LABELS.length) {
               await github.rest.issues.addLabels({
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                labels: [labelName],
+                labels: ADD_LABELS.split(","),
               });
             }
+...
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 71a792600..881cef447 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -137,52 +137,6 @@ jobs:
       - name: "Publish client to rubygems"
         run: |
           bash .github/workflows/scripts/publish_client_gem.sh ${{ github.ref_name }}
-  publish-docs:
-    runs-on: "ubuntu-latest"
-    needs:
-      - "build"
-
-    env:
-      GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-
-    steps:
-      - uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 1
-          path: "pulp_rpm"
-
-      - uses: "actions/setup-python@v5"
-        with:
-          python-version: "3.11"
-
-      - name: "Install python dependencies"
-        run: |
-          echo ::group::PYDEPS
-          pip install 'packaging~=21.3' requests
-          echo ::endgroup::
-
-      - name: "Setting secrets"
-        run: |
-          python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT"
-        env:
-          SECRETS_CONTEXT: "${{ toJson(secrets) }}"
-
-      - name: "Download built docs"
-        uses: "actions/download-artifact@v4"
-        with:
-          name: "docs.tar"
-          path: "pulp_rpm/"
-
-      - name: "Download Python client docs"
-        uses: "actions/download-artifact@v4"
-        with:
-          name: "python-client-docs.tar"
-          path: "pulp_rpm/"
-
-      - name: "Publish docs to pulpproject.org"
-        run: |
-          tar -xvf docs.tar
-          .github/workflows/scripts/publish_docs.sh tag ${{ github.ref_name }}
 
   create-gh-release:
     runs-on: "ubuntu-latest"
@@ -191,7 +145,6 @@ jobs:
       - "publish-package"
       - "publish-python-bindings"
       - "publish-ruby-bindings"
-      - "publish-docs"
 
     steps:
       - name: "Create release on GitHub"
diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh
index 5d949dd29..e2ef810cb 100755
--- a/.github/workflows/scripts/before_install.sh
+++ b/.github/workflows/scripts/before_install.sh
@@ -57,7 +57,7 @@ fi
 
 for i in {1..3}
 do
-  ansible-galaxy collection install "amazon.aws:1.5.0" && s=0 && break || s=$? && sleep 3
+  ansible-galaxy collection install "amazon.aws:8.1.0" && s=0 && break || s=$? && sleep 3
 done
 if [[ $s -gt 0 ]]
 then
@@ -65,9 +65,11 @@ then
   exit $s
 fi
 
+if [[ "$TEST" = "pulp" ]]; then
+  python3 .ci/scripts/calc_constraints.py -u requirements.txt > upperbounds_constraints.txt
+fi
 if [[ "$TEST" = "lowerbounds" ]]; then
-  python3 .ci/scripts/calc_deps_lowerbounds.py > lowerbounds_constraints.txt
-  sed -i 's/\[.*\]//g' lowerbounds_constraints.txt
+  python3 .ci/scripts/calc_constraints.py requirements.txt > lowerbounds_constraints.txt
 fi
 
 if [ -f $POST_BEFORE_INSTALL ]; then
diff --git a/.github/workflows/scripts/build_python_client.sh b/.github/workflows/scripts/build_python_client.sh
index 372aeb839..332feedce 100755
--- a/.github/workflows/scripts/build_python_client.sh
+++ b/.github/workflows/scripts/build_python_client.sh
@@ -18,9 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 pushd ../pulp-openapi-generator
 rm -rf "pulp_rpm-client"
 
-# We need to copy that over to be visible in the container.
-cp "../pulp_rpm/rpm-api.json" .
-./gen-client.sh "rpm-api.json" "rpm" python "pulp_rpm"
+./gen-client.sh "../pulp_rpm/rpm-api.json" "rpm" python "pulp_rpm"
 
 pushd pulp_rpm-client
 python setup.py sdist bdist_wheel --python-tag py3
diff --git a/.github/workflows/scripts/build_ruby_client.sh b/.github/workflows/scripts/build_ruby_client.sh
index 651170199..4a5a80367 100755
--- a/.github/workflows/scripts/build_ruby_client.sh
+++ b/.github/workflows/scripts/build_ruby_client.sh
@@ -18,15 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 pushd ../pulp-openapi-generator
 rm -rf "pulp_rpm-client"
 
-# We need to copy that over to be visible in the container.
-#cp "../pulp_rpm/rpm-api.json" .
-#./gen-client.sh "rpm-api.json" "rpm" ruby "pulp_rpm"
-
-# -------------
-# The generator still needs to have it called api.json at this time...
-cp "../pulp_rpm/api.json" .
-./gen-client.sh "api.json" "rpm" ruby "pulp_rpm"
-# -------------
+./gen-client.sh "../pulp_rpm/rpm-api.json" "rpm" ruby "pulp_rpm"
 
 pushd pulp_rpm-client
 gem build pulp_rpm_client
diff --git a/.github/workflows/scripts/docs-publisher.py b/.github/workflows/scripts/docs-publisher.py
deleted file mode 100755
index 5b38aff56..000000000
--- a/.github/workflows/scripts/docs-publisher.py
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/usr/bin/env python
-
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_rpm' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-
-import argparse
-import subprocess
-import os
-import re
-from shutil import rmtree
-import tempfile
-import requests
-import json
-from packaging import version
-
-WORKING_DIR = os.environ["WORKSPACE"]
-
-VERSION_REGEX = r"(\s*)(version)(\s*)(=)(\s*)(['\"])(.*)(['\"])(.*)"
-RELEASE_REGEX = r"(\s*)(release)(\s*)(=)(\s*)(['\"])(.*)(['\"])(.*)"
-
-USERNAME = "doc_builder_pulp_rpm"
-HOSTNAME = "8.43.85.236"
-
-SITE_ROOT = "/var/www/docs.pulpproject.org/pulp_rpm/"
-
-
-def make_directory_with_rsync(remote_paths_list):
-    """
-    Ensure the remote directory path exists.
-
-    :param remote_paths_list: The list of parameters. e.g. ['en', 'latest'] to be en/latest on the
-        remote.
-    :type remote_paths_list: a list of strings, with each string representing a directory.
-    """
-    try:
-        tempdir_path = tempfile.mkdtemp()
-        cwd = os.getcwd()
-        os.chdir(tempdir_path)
-        os.makedirs(os.sep.join(remote_paths_list))
-        remote_path_arg = "%s@%s:%s%s" % (
-            USERNAME,
-            HOSTNAME,
-            SITE_ROOT,
-            remote_paths_list[0],
-        )
-        local_path_arg = tempdir_path + os.sep + remote_paths_list[0] + os.sep
-        rsync_command = ["rsync", "-avzh", local_path_arg, remote_path_arg]
-        exit_code = subprocess.call(rsync_command)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while creating remote directories.")
-    finally:
-        rmtree(tempdir_path)
-        os.chdir(cwd)
-
-
-def ensure_dir(target_dir, clean=True):
-    """
-    Ensure that the directory specified exists and is empty.
-
-    By default this will delete the directory if it already exists
-
-    :param target_dir: The directory to process
-    :type target_dir: str
-    :param clean: Whether or not the directory should be removed and recreated
-    :type clean: bool
-    """
-    if clean:
-        rmtree(target_dir, ignore_errors=True)
-    try:
-        os.makedirs(target_dir)
-    except OSError:
-        pass
-
-
-def main():
-    """
-    Builds documentation using the 'make html' command and rsyncs to docs.pulpproject.org.
-    """
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--build-type", required=True, help="Build type: nightly, tag or changelog."
-    )
-    parser.add_argument("--branch", required=True, help="Branch or tag name.")
-    opts = parser.parse_args()
-
-    build_type = opts.build_type
-
-    branch = opts.branch
-
-    publish_at_root = False
-
-    # rsync the docs
-    print("rsync the docs")
-    docs_directory = os.sep.join([WORKING_DIR, "docs"])
-    local_path_arg = os.sep.join([docs_directory, "_build", "html"]) + os.sep
-    if build_type == "nightly":
-        # This is a nightly build
-        remote_path_arg = "%s@%s:%sen/%s/%s/" % (
-            USERNAME,
-            HOSTNAME,
-            SITE_ROOT,
-            branch,
-            build_type,
-        )
-        make_directory_with_rsync(["en", branch, build_type])
-        rsync_command = ["rsync", "-avzh", "--delete", local_path_arg, remote_path_arg]
-        exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while pushing docs.")
-    elif build_type == "tag":
-        if (not re.search("[a-zA-Z]", branch) or "post" in branch) and len(branch.split(".")) > 2:
-            # Only publish docs at the root if this is the latest version
-            r = requests.get("https://pypi.org/pypi/pulp-rpm/json")
-            latest_version = version.parse(json.loads(r.text)["info"]["version"])
-            docs_version = version.parse(branch)
-            # This is to mitigate delays on PyPI which doesn't update metadata in timely manner.
-            # It doesn't prevent incorrect docs being published at root if 2 releases are done close
-            # to each other, within PyPI delay. E.g. Release 3.11.0 an then 3.10.1 immediately
-            # after.
-            if docs_version >= latest_version:
-                publish_at_root = True
-            # Post releases should use the x.y.z part of the version string to form a path
-            if "post" in branch:
-                branch = ".".join(branch.split(".")[:-1])
-
-            # This is a GA build.
-            # publish to the root of docs.pulpproject.org
-            if publish_at_root:
-                version_components = branch.split(".")
-                x_y_version = "{}.{}".format(version_components[0], version_components[1])
-                remote_path_arg = "%s@%s:%s" % (USERNAME, HOSTNAME, SITE_ROOT)
-                rsync_command = [
-                    "rsync",
-                    "-avzh",
-                    "--delete",
-                    "--exclude",
-                    "en",
-                    "--omit-dir-times",
-                    local_path_arg,
-                    remote_path_arg,
-                ]
-                exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-                if exit_code != 0:
-                    raise RuntimeError("An error occurred while pushing docs.")
-                # publish to docs.pulpproject.org/en/3.y/
-                make_directory_with_rsync(["en", x_y_version])
-                remote_path_arg = "%s@%s:%sen/%s/" % (
-                    USERNAME,
-                    HOSTNAME,
-                    SITE_ROOT,
-                    x_y_version,
-                )
-                rsync_command = [
-                    "rsync",
-                    "-avzh",
-                    "--delete",
-                    "--omit-dir-times",
-                    local_path_arg,
-                    remote_path_arg,
-                ]
-                exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-                if exit_code != 0:
-                    raise RuntimeError("An error occurred while pushing docs.")
-            # publish to docs.pulpproject.org/en/3.y.z/
-            make_directory_with_rsync(["en", branch])
-            remote_path_arg = "%s@%s:%sen/%s/" % (USERNAME, HOSTNAME, SITE_ROOT, branch)
-            rsync_command = [
-                "rsync",
-                "-avzh",
-                "--delete",
-                "--omit-dir-times",
-                local_path_arg,
-                remote_path_arg,
-            ]
-            exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-            if exit_code != 0:
-                raise RuntimeError("An error occurred while pushing docs.")
-        else:
-            # This is a pre-release
-            make_directory_with_rsync(["en", branch])
-            remote_path_arg = "%s@%s:%sen/%s/%s/" % (
-                USERNAME,
-                HOSTNAME,
-                SITE_ROOT,
-                branch,
-                build_type,
-            )
-            rsync_command = [
-                "rsync",
-                "-avzh",
-                "--delete",
-                "--exclude",
-                "nightly",
-                "--exclude",
-                "testing",
-                local_path_arg,
-                remote_path_arg,
-            ]
-            exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-            if exit_code != 0:
-                raise RuntimeError("An error occurred while pushing docs.")
-        # publish to docs.pulpproject.org/en/3.y/
-        version_components = branch.split(".")
-        x_y_version = "{}.{}".format(version_components[0], version_components[1])
-        make_directory_with_rsync(["en", x_y_version])
-        remote_path_arg = "%s@%s:%sen/%s/" % (
-            USERNAME,
-            HOSTNAME,
-            SITE_ROOT,
-            x_y_version,
-        )
-        rsync_command = [
-            "rsync",
-            "-avzh",
-            "--delete",
-            "--omit-dir-times",
-            local_path_arg,
-            remote_path_arg,
-        ]
-        exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while pushing docs.")
-        # publish to docs.pulpproject.org/en/3.y.z/
-        make_directory_with_rsync(["en", branch])
-        remote_path_arg = "%s@%s:%sen/%s/" % (USERNAME, HOSTNAME, SITE_ROOT, branch)
-        rsync_command = [
-            "rsync",
-            "-avzh",
-            "--delete",
-            "--omit-dir-times",
-            local_path_arg,
-            remote_path_arg,
-        ]
-        exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while pushing docs.")
-    elif build_type == "changelog":
-        if branch != "main":
-            raise RuntimeError("Can only publish CHANGELOG from main")
-        # Publish the CHANGELOG from main branch at the root directory
-        remote_path_arg = "%s@%s:%s" % (USERNAME, HOSTNAME, SITE_ROOT)
-        changelog_local_path_arg = os.path.join(local_path_arg, "changes.html")
-        rsync_command = [
-            "rsync",
-            "-vzh",
-            "--omit-dir-times",
-            changelog_local_path_arg,
-            remote_path_arg,
-        ]
-        exit_code = subprocess.call(rsync_command, cwd=docs_directory)
-        if exit_code != 0:
-            raise RuntimeError("An error occurred while pushing docs.")
-    else:
-        raise RuntimeError("Build type must be either 'nightly', 'tag' or 'changelog'.")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index ff816ddf7..3605099c6 100755
--- a/.github/workflows/scripts/install.sh
+++ b/.github/workflows/scripts/install.sh
@@ -21,20 +21,13 @@ PLUGIN_SOURCE="./pulp_rpm/dist/pulp_rpm-${PLUGIN_VERSION}-py3-none-any.whl"
 export PULP_API_ROOT="/pulp/"
 
 PIP_REQUIREMENTS=("pulp-cli")
-if [[ "$TEST" = "docs" || "$TEST" = "publish" ]]
-then
-  PIP_REQUIREMENTS+=("-r" "doc_requirements.txt")
-  git clone https://github.com/pulp/pulpcore.git ../pulpcore
-  PIP_REQUIREMENTS+=("psycopg2-binary" "-r" "../pulpcore/doc_requirements.txt")
-fi
 
+# This must be the **only** call to "pip install" on the test runner.
 pip install ${PIP_REQUIREMENTS[*]}
 
-if [[ "$TEST" != "docs" ]]
-then
-  PULP_CLI_VERSION="$(pip freeze | sed -n -e 's/pulp-cli==//p')"
-  git clone --depth 1 --branch "$PULP_CLI_VERSION" https://github.com/pulp/pulp-cli.git ../pulp-cli
-fi
+# Check out the pulp-cli branch matching the installed version.
+PULP_CLI_VERSION="$(pip freeze | sed -n -e 's/pulp-cli==//p')"
+git clone --depth 1 --branch "$PULP_CLI_VERSION" https://github.com/pulp/pulp-cli.git ../pulp-cli
 
 cd .ci/ansible/
 if [ "$TEST" = "s3" ]; then
@@ -57,6 +50,11 @@ if [[ -f ../../ci_requirements.txt ]]; then
     ci_requirements: true
 VARSYAML
 fi
+if [ "$TEST" = "pulp" ]; then
+  cat >> vars/main.yaml << VARSYAML
+    upperbounds: true
+VARSYAML
+fi
 if [ "$TEST" = "lowerbounds" ]; then
   cat >> vars/main.yaml << VARSYAML
     lowerbounds: true
@@ -133,9 +131,7 @@ if [ "${PULP_API_ROOT:-}" ]; then
 fi
 
 pulp config create --base-url https://pulp --api-root "$PULP_API_ROOT" --username "admin" --password "password"
-if [[ "$TEST" != "docs" ]]; then
-  cp ~/.config/pulp/cli.toml "${REPO_ROOT}/../pulp-cli/tests/cli.toml"
-fi
+cp ~/.config/pulp/cli.toml "${REPO_ROOT}/../pulp-cli/tests/cli.toml"
 
 ansible-playbook build_container.yaml
 ansible-playbook start_container.yaml
@@ -170,5 +166,5 @@ if [[ "$TEST" = "azure" ]]; then
 fi
 
 echo ::group::PIP_LIST
-cmd_prefix bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
+cmd_prefix bash -c "pip3 list && pipdeptree"
 echo ::endgroup::
diff --git a/.github/workflows/scripts/post_docs_test.sh b/.github/workflows/scripts/post_docs_test.sh
deleted file mode 100755
index c9a9e5e40..000000000
--- a/.github/workflows/scripts/post_docs_test.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env sh
-
-export BASE_ADDR=https://pulp:443
-export CONTENT_ADDR=https://pulp:443
-
-cd docs/_scripts/
-bash docs_check_upload.sh
-bash docs_check_sync.sh
-bash docs_check_copy.sh
-bash docs_check_delete.sh
diff --git a/.github/workflows/scripts/publish_docs.sh b/.github/workflows/scripts/publish_docs.sh
deleted file mode 100755
index 0e0827dca..000000000
--- a/.github/workflows/scripts/publish_docs.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# WARNING: DO NOT EDIT!
-#
-# This file was generated by plugin_template, and is managed by it. Please use
-# './plugin-template --github pulp_rpm' to update this file.
-#
-# For more info visit https://github.com/pulp/plugin_template
-
-set -euv
-
-# make sure this script runs at the repo root
-cd "$(dirname "$(realpath -e "$0")")/../../.."
-
-mkdir ~/.ssh
-touch ~/.ssh/pulp-infra
-chmod 600 ~/.ssh/pulp-infra
-echo "$PULP_DOCS_KEY" > ~/.ssh/pulp-infra
-
-echo "docs.pulpproject.org,8.43.85.236 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGXG+8vjSQvnAkq33i0XWgpSrbco3rRqNZr0SfVeiqFI7RN/VznwXMioDDhc+hQtgVhd6TYBOrV07IMcKj+FAzg=" >> ~/.ssh/known_hosts
-chmod 644 ~/.ssh/known_hosts
-
-export PYTHONUNBUFFERED=1
-export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
-export PULP_SETTINGS=$PWD/.ci/ansible/settings/settings.py
-export WORKSPACE=$PWD
-
-# start the ssh agent
-eval "$(ssh-agent -s)"
-ssh-add ~/.ssh/pulp-infra
-
-python3 .github/workflows/scripts/docs-publisher.py --build-type "$1" --branch "$2"
-
-if [[ "$GITHUB_WORKFLOW" == "Rpm changelog update" ]]; then
-  # Do not build bindings docs on changelog update
-  exit
-fi
-
-mkdir -p ../rpm-bindings
-tar -xvf rpm-python-client-docs.tar --directory ../rpm-bindings
-pushd ../rpm-bindings
-
-# publish to docs.pulpproject.org/pulp_rpm_client
-rsync -avzh site/ doc_builder_pulp_rpm@docs.pulpproject.org:/var/www/docs.pulpproject.org/pulp_rpm_client/
-
-# publish to docs.pulpproject.org/pulp_rpm_client/en/{release}
-rsync -avzh site/ doc_builder_pulp_rpm@docs.pulpproject.org:/var/www/docs.pulpproject.org/pulp_rpm_client/en/"$2"
-popd
diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh
index ab84d9d15..90a752cab 100755
--- a/.github/workflows/scripts/script.sh
+++ b/.github/workflows/scripts/script.sh
@@ -16,10 +16,9 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
 source .github/workflows/scripts/utils.sh
 
 export POST_SCRIPT=$PWD/.github/workflows/scripts/post_script.sh
-export POST_DOCS_TEST=$PWD/.github/workflows/scripts/post_docs_test.sh
 export FUNC_TEST_SCRIPT=$PWD/.github/workflows/scripts/func_test_script.sh
 
-# Needed for both starting the service and building the docs.
+# Needed for starting the service
 # Gets set in .github/settings.yml, but doesn't seem to inherited by
 # this script.
 export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
@@ -27,22 +26,6 @@ export PULP_SETTINGS=$PWD/.ci/ansible/settings/settings.py
 
 export PULP_URL="https://pulp"
 
-if [[ "$TEST" = "docs" ]]; then
-  if [[ "$GITHUB_WORKFLOW" == "Rpm CI" ]]; then
-    towncrier build --yes --version 4.0.0.ci
-  fi
-  # Legacy Docs Build
-  cd docs
-  make PULP_URL="$PULP_URL" diagrams html
-  tar -cvf docs.tar ./_build
-  cd ..
-
-  if [ -f "$POST_DOCS_TEST" ]; then
-    source "$POST_DOCS_TEST"
-  fi
-  exit
-fi
-
 REPORTED_STATUS="$(pulp status)"
 
 echo "machine pulp
@@ -145,11 +128,11 @@ if [ -f "$FUNC_TEST_SCRIPT" ]; then
 else
   if [[ "$GITHUB_WORKFLOW" =~ "Nightly" ]]
   then
-    cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_rpm.tests.functional -m parallel -n 8 --nightly"
-    cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_rpm.tests.functional -m 'not parallel' --nightly"
+    cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_rpm.tests.functional -m parallel -n 8 --nightly"
+    cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_rpm.tests.functional -m 'not parallel' --nightly"
   else
-    cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_rpm.tests.functional -m parallel -n 8"
-    cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_rpm.tests.functional -m 'not parallel'"
+    cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_rpm.tests.functional -m parallel -n 8"
+    cmd_user_prefix bash -c "pytest -v --timeout=300 -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_rpm.tests.functional -m 'not parallel'"
   fi
 fi
 export PULP_FIXTURES_URL="http://pulp-fixtures:8080"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d2cb5abe1..7175ee868 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,6 @@ jobs:
       matrix:
         env:
           - TEST: pulp
-          - TEST: docs
           - TEST: azure
           - TEST: s3
           - TEST: lowerbounds
@@ -72,7 +71,7 @@ jobs:
       - name: "Install python dependencies"
         run: |
           echo ::group::PYDEPS
-          pip install towncrier twine wheel httpie docker netaddr boto3 ansible mkdocs jq jsonpatch
+          pip install towncrier twine wheel httpie docker netaddr boto3 'ansible~=10.3.0' mkdocs jq jsonpatch
           echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/pulp_rpm/.ci/assets/httpie/" >> $GITHUB_ENV
           echo ::endgroup::
 
@@ -137,15 +136,6 @@ jobs:
           if-no-files-found: "error"
           retention-days: 5
           overwrite: true
-      - name: Upload built docs
-        if: ${{ env.TEST == 'docs' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: "docs.tar"
-          path: "pulp_rpm/docs/docs.tar"
-          if-no-files-found: "error"
-          retention-days: 5
-          overwrite: true
 
       - name: "Logs"
         if: always()
diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml
index 7cf22cafe..0294d3b5b 100644
--- a/.github/workflows/update_ci.yml
+++ b/.github/workflows/update_ci.yml
@@ -11,8 +11,8 @@ name: "Rpm CI Update"
 on:
   schedule:
     # * is a special character in YAML so you have to quote this string
-    # runs at 2:30 UTC every Sunday
-    - cron: '30 2 * * 0'
+    # runs at 23:30 UTC every Sunday
+    - cron: '30 23 * * 0'
   workflow_dispatch:
 
 jobs:
@@ -36,7 +36,7 @@ jobs:
       - name: "Install python dependencies"
         run: |
           echo ::group::PYDEPS
-          pip install gitpython requests packaging jinja2 pyyaml
+          pip install gitpython packaging -r plugin_template/requirements.txt
           echo ::endgroup::
 
       - name: "Configure Git with pulpbot name and email"
@@ -62,11 +62,7 @@ jobs:
           committer: "pulpbot <pulp-infra@redhat.com>"
           author: "pulpbot <pulp-infra@redhat.com>"
           title: "Update CI files for branch main"
-          body: ""
           branch: "update-ci/main"
           base: "main"
-          commit-message: |
-            Update CI files
-
-            [noissue]
           delete-branch: true
+...
diff --git a/doc_requirements.txt b/doc_requirements.txt
index 510877332..070e9d76a 100644
--- a/doc_requirements.txt
+++ b/doc_requirements.txt
@@ -1,5 +1,8 @@
-plantuml
-sphinx
-sphinx-rtd-theme
-sphinxcontrib-openapi
+# WARNING: DO NOT EDIT!
+#
+# This file was generated by plugin_template, and is managed by it. Please use
+# './plugin-template --github pulp_rpm' to update this file.
+#
+# For more info visit https://github.com/pulp/plugin_template
 towncrier
+pulp-docs @ git+https://github.com/pulp/pulp-docs@main
diff --git a/functest_requirements.txt b/functest_requirements.txt
index 3ae954b24..32e5c1bd6 100644
--- a/functest_requirements.txt
+++ b/functest_requirements.txt
@@ -8,3 +8,5 @@ pyyaml
 lxml
 pyzstd
 requests
+pytest-xdist
+pytest-timeout
diff --git a/template_config.yml b/template_config.yml
index 8e9e7bdb7..351bb5dbf 100644
--- a/template_config.yml
+++ b/template_config.yml
@@ -1,7 +1,7 @@
 # This config represents the latest values used when running the plugin-template. Any settings that
 # were not present before running plugin-template have been added with their default values.
 
-# generated with plugin_template@2021.08.26-348-gb87ed3b
+# generated with plugin_template@2021.08.26-382-gc88324b
 
 api_root: /pulp/
 black: true
@@ -12,7 +12,6 @@ check_stray_pulpcore_imports: true
 ci_base_image: ghcr.io/pulp/pulp-ci-centos
 ci_env: {}
 ci_trigger: '{pull_request: {branches: [''*'']}}'
-ci_update_docs: false
 cli_package: pulp-cli
 cli_repo: https://github.com/pulp/pulp-cli.git
 core_import_allowed: []
@@ -20,18 +19,12 @@ deploy_client_to_pypi: true
 deploy_client_to_rubygems: true
 deploy_to_pypi: true
 disabled_redis_runners: []
-doc_requirements_from_pulpcore: true
 docker_fixtures: true
-docs_test: true
-extra_docs_requirements: []
 flake8: true
 flake8_ignore: []
 github_org: pulp
-issue_tracker: github
-kanban: true
 latest_release_branch: null
 lint_requirements: true
-noissue_marker: '[noissue]'
 os_required_packages: []
 parallel_test_workers: 8
 plugin_app_label: rpm
@@ -42,7 +35,6 @@ plugins:
   name: pulp_rpm
 post_job_template: null
 pre_job_template: null
-publish_docs_to_pulpprojectdotorg: true
 pulp_env: {}
 pulp_env_azure: {}
 pulp_env_gcp: {}
@@ -84,6 +76,4 @@ test_performance:
 test_reroute: true
 test_s3: true
 use_issue_template: true
-use_legacy_docs: true
-use_unified_docs: false