diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh index 0cc92e03ffc..26cfbedb639 100755 --- a/.github/workflows/scripts/before_install.sh +++ b/.github/workflows/scripts/before_install.sh @@ -41,8 +41,6 @@ fi # Compose the scenario definition. mkdir -p .ci/ansible/vars -ENVVAR_HEADER_GUARD_TEST_SECRET="$(python3 -c 'import secrets; print(secrets.token_urlsafe(50))')" -export ENVVAR_HEADER_GUARD_TEST_SECRET cat > .ci/ansible/vars/main.yaml << VARSYAML --- @@ -51,7 +49,7 @@ plugin_name: "pulpcore" legacy_component_name: "pulpcore" component_name: "core" component_version: "${COMPONENT_VERSION}" -pulp_env: {"ENVVAR_HEADER_GUARD_TEST_SECRET": "${ENVVAR_HEADER_GUARD_TEST_SECRET}", "PULP_CA_BUNDLE": "/etc/pulp/certs/pulp_webserver.crt"} +pulp_env: {"PULP_CA_BUNDLE": "/etc/pulp/certs/pulp_webserver.crt"} pulp_settings: {"allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"], "api_root": "/pulp/", "content_path_prefix": "/somewhere/else/", "csrf_trusted_origins": ["https://pulp:443"], "distributed_publication_retention_period": 3, "envvar_header_content_guard_allowed_vars": ["ENVVAR_HEADER_GUARD_TEST_SECRET"], "orphan_protection_time": 0, "task_diagnostics": ["memory"], "task_protection_time": 10, "tmpfile_protection_time": 10, "upload_protection_time": 10} pulp_scheme: "https" image: diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 97439d74c62..edd680a451f 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -114,7 +114,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.118" + ref: "3.119" - name: "Run update" working-directory: "pulpcore" @@ -123,21 +123,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v8" - id: "create_pr_3_118" + id: "create_pr_3_119" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.118" - branch: "update-ci/3.118" - base: "3.118" + title: "Update CI files for branch 3.119" + branch: "update-ci/3.119" + base: "3.119" delete-branch: true - name: "Mark PR automerge" working-directory: "pulpcore" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_118.outputs.pull-request-number }}" - if: "steps.create_pr_3_118.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_119.outputs.pull-request-number }}" + if: "steps.create_pr_3_119.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+reduce-content-queries.bugfix b/CHANGES/+reduce-content-queries.bugfix deleted file mode 100644 index f5dd444ed16..00000000000 --- a/CHANGES/+reduce-content-queries.bugfix +++ /dev/null @@ -1 +0,0 @@ -Reduce the number and size of queries made for each content app request. diff --git a/CHANGES/+replicate-ssl-tempfiles.bugfix b/CHANGES/+replicate-ssl-tempfiles.bugfix deleted file mode 100644 index 3c9642aef77..00000000000 --- a/CHANGES/+replicate-ssl-tempfiles.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed replicate() deleting temporary TLS files before pulp-glue could use them, and stopped leaking PULP_CA_BUNDLE into later worker tasks. diff --git a/CHANGES/+unsafe-task-exceptions.bugfix b/CHANGES/+unsafe-task-exceptions.bugfix deleted file mode 100644 index 7e493eb8c9c..00000000000 --- a/CHANGES/+unsafe-task-exceptions.bugfix +++ /dev/null @@ -1 +0,0 @@ -Task failures that previously surfaced as unhandled Python exceptions (deleting an object still referenced by others, replication errors, and failed subtasks) now raise proper Pulp errors, so their messages are preserved and reported clearly. diff --git a/CHANGES/8007.feature b/CHANGES/8007.feature deleted file mode 100644 index b598f59dfa8..00000000000 --- a/CHANGES/8007.feature +++ /dev/null @@ -1 +0,0 @@ -Added ``EnvVarHeaderContentGuard`` to validate a Base64-encoded header against a content-app environment variable listed in ``ENVVAR_HEADER_CONTENT_GUARD_ALLOWED_VARS``. diff --git a/CHANGES/8067.bugfix b/CHANGES/8067.bugfix deleted file mode 100644 index aa40b657736..00000000000 --- a/CHANGES/8067.bugfix +++ /dev/null @@ -1 +0,0 @@ -Add a management command to help remove distributions with a dysfunctional base_path that prevents upgrading to 3.117. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index f3ab9ab0d3a..82d71f57650 100644 --- a/pulp_certguard/app/__init__.py +++ b/pulp_certguard/app/__init__.py @@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig): name = "pulp_certguard.app" label = "certguard" - version = "3.119.0.dev" + version = "3.120.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index ec51985d10f..b23324aba29 100644 --- a/pulp_file/app/__init__.py +++ b/pulp_file/app/__init__.py @@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig): name = "pulp_file.app" label = "file" - version = "3.119.0.dev" + version = "3.120.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 28662b1ce13..bfa7b3b609c 100644 --- a/pulpcore/app/apps.py +++ b/pulpcore/app/apps.py @@ -238,7 +238,7 @@ class PulpAppConfig(PulpPluginAppConfig): label = "core" # The version of this app - version = "3.119.0.dev" + version = "3.120.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/pyproject.toml b/pyproject.toml index 8f1a270649f..5581cae16e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulpcore" -version = "3.119.0.dev" +version = "3.120.0.dev" description = "Pulp Django Application and Related Modules" readme = "README.md" authors = [ @@ -207,7 +207,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.119.0.dev" +current_version = "3.120.0.dev" commit = false tag = false parse = "(?P\\d+)\\.(?P\\d+)\\.(?P0a)?(?P\\d+)(\\.(?P[a-z]+))?" diff --git a/template_config.yml b/template_config.yml index b94eb26ad77..ccc2702b016 100644 --- a/template_config.yml +++ b/template_config.yml @@ -25,7 +25,7 @@ extra_files: - destination: "/etc/nginx/pulp/api_root_rewrite.conf" origin: "pulpcore/pulpcore/tests/functional/assets/api_root_rewrite.conf" github_org: "pulp" -latest_release_branch: "3.118" +latest_release_branch: "3.119" lint_ignore: - "./pulpcore/app/protobuf/*" lint_requirements: true @@ -52,13 +52,13 @@ pulp_settings: - "/tmp" allowed_import_paths: - "/tmp" - envvar_header_content_guard_allowed_vars: - - "ENVVAR_HEADER_GUARD_TEST_SECRET" api_root: "/pulp/" content_path_prefix: "/somewhere/else/" csrf_trusted_origins: - "https://pulp:443" distributed_publication_retention_period: 3 + envvar_header_content_guard_allowed_vars: + - "ENVVAR_HEADER_GUARD_TEST_SECRET" orphan_protection_time: 0 task_diagnostics: - "memory" @@ -147,3 +147,4 @@ test_performance: false test_s3: true use_issue_template: true ... +