Merge branch 'main' of https://github.com/pulp/pulpcore into oidc-authentication-core

# Conflicts:
#	pulpcore/app/access_policy.py
#	pyproject.toml

Author: BaptisteCentreon

.ci/ansible/settings.py.j2

@@ -1,3 +1,4 @@
+SECRET_KEY = "{{ django_secret }}"
 CONTENT_ORIGIN = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}"
 ANSIBLE_API_HOSTNAME = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}"
 ANSIBLE_CONTENT_HOSTNAME = "{{ pulp_scheme }}://pulp:{{ 443 if pulp_scheme == 'https' else 80 }}/pulp/content"

.ci/ansible/start_container.yaml

@@ -18,6 +18,8 @@
       ansible.builtin.template:
         src: "settings.py.j2"
         dest: "settings/settings.py"
+      vars:
+        django_secret: "lookup('community.general.random_string', length=50, overwrite_all='abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)')"
 
     - name: "Setup docker networking"
       community.docker.docker_network:

.ci/assets/ci_constraints.txt

@@ -17,3 +17,7 @@ azure-storage-blob!=12.28.*
 
 pycares<5
 # older aiodns versions don't pin pycares UB, and are broken by pycares>=5
+
+
+pytest-django!=4.13.0
+# This version seems not to not have a proper requirement on Django.

.github/workflows/scripts/before_install.sh

@@ -55,7 +55,7 @@ pulp_scheme: "https"
 image:
   name: "pulp"
   tag: "ci_build"
-  ci_base: "ghcr.io/pulp/pulp-ci-centos9:latest"
+  ci_base: "ghcr.io/pulp/pulp-ci-centos10:latest"
   source: "${COMPONENT_SOURCE}"
   ci_requirements: $(test -f ci_requirements.txt && echo -n true || echo -n false)
   upperbounds: $(test "${TEST}" = "pulp" && echo -n true || echo -n false)

.github/workflows/update_ci.yml

@@ -107,7 +107,7 @@ jobs:
         with:
           fetch-depth: 0
           path: "pulpcore"
-          ref: "3.114"
+          ref: "3.116"
 
       - name: "Run update"
         working-directory: "pulpcore"
@@ -116,21 +116,21 @@ jobs:
 
       - name: "Create Pull Request for CI files"
         uses: "peter-evans/create-pull-request@v8"
-        id: "create_pr_3_114"
+        id: "create_pr_3_116"
         with:
           token: "${{ secrets.RELEASE_TOKEN }}"
           path: "pulpcore"
           committer: "pulpbot <pulp-infra@redhat.com>"
           author: "pulpbot <pulp-infra@redhat.com>"
-          title: "Update CI files for branch 3.114"
-          branch: "update-ci/3.114"
-          base: "3.114"
+          title: "Update CI files for branch 3.116"
+          branch: "update-ci/3.116"
+          base: "3.116"
           delete-branch: true
       - name: "Mark PR automerge"
         working-directory: "pulpcore"
         run: |
-          gh pr merge --rebase --auto "${{ steps.create_pr_3_114.outputs.pull-request-number }}"
-        if: "steps.create_pr_3_114.outputs.pull-request-number"
+          gh pr merge --rebase --auto "${{ steps.create_pr_3_116.outputs.pull-request-number }}"
+        if: "steps.create_pr_3_116.outputs.pull-request-number"
         env:
           GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
         continue-on-error: true