From 4e670ff8732d0c4244dfe4507b62d4fa67cdb30c Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 16 Jun 2024 18:22:06 +0000 Subject: [PATCH] Bump minor version [noissue] --- .bumpversion.cfg | 2 +- .ci/ansible/settings.py.j2 | 2 +- .github/template_gitref | 2 +- .github/workflows/scripts/install.sh | 26 +++----------------------- .github/workflows/update_ci.yml | 8 ++++---- CHANGES/2909.feature | 1 - CHANGES/2986.feature | 1 - CHANGES/3572.bugfix | 1 - CHANGES/3587.bugfix | 1 - CHANGES/3599.bugfix | 1 - docs/conf.py | 4 ++-- pulp_rpm/app/__init__.py | 2 +- setup.py | 2 +- template_config.yml | 4 ++-- 14 files changed, 16 insertions(+), 41 deletions(-) delete mode 100644 CHANGES/2909.feature delete mode 100644 CHANGES/2986.feature delete mode 100644 CHANGES/3572.bugfix delete mode 100644 CHANGES/3587.bugfix delete mode 100644 CHANGES/3599.bugfix diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c79ec35e6..1f349abf5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.27.0.dev +current_version = 3.28.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.ci/ansible/settings.py.j2 b/.ci/ansible/settings.py.j2 index 024df4e4c..4ed28f42a 100644 --- a/.ci/ansible/settings.py.j2 +++ b/.ci/ansible/settings.py.j2 @@ -49,7 +49,7 @@ AZURE_CONTAINER = "pulp-test" AZURE_LOCATION = "pulp3" AZURE_OVERWRITE_FILES = True AZURE_URL_EXPIRATION_SECS = 120 -AZURE_CONNECTION_STRING = 'DefaultEndpointsProtocol={{ pulp_scheme }};AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint={{ pulp_scheme }}://ci-azurite:10000/devstoreaccount1;' +AZURE_CONNECTION_STRING = 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;' {% endif %} {% if gcp_test | default(false) %} diff --git a/.github/template_gitref b/.github/template_gitref index dadaa1c99..9122ea225 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-338-g2237db8 +2021.08.26-339-gf0d923e diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index ec0eead39..ca69dc4dd 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -112,18 +112,12 @@ pulp_scenario_env: {}\ fi if [ "$TEST" = "azure" ]; then - mkdir -p azurite - cd azurite - openssl req -newkey rsa:2048 -x509 -nodes -keyout azkey.pem -new -out azcert.pem -sha256 -days 365 -addext "subjectAltName=DNS:ci-azurite" -subj "/C=CO/ST=ST/L=LO/O=OR/OU=OU/CN=CN" - sudo cp azcert.pem /usr/local/share/ca-certificates/azcert.crt - sudo dpkg-reconfigure ca-certificates - cd .. sed -i -e '/^services:/a \ - name: ci-azurite\ image: mcr.microsoft.com/azure-storage/azurite\ volumes:\ - ./azurite:/etc/pulp\ - command: "azurite-blob --blobHost 0.0.0.0 --cert /etc/pulp/azcert.pem --key /etc/pulp/azkey.pem"' vars/main.yaml + command: "azurite-blob --blobHost 0.0.0.0"' vars/main.yaml sed -i -e '$a azure_test: true\ pulp_scenario_settings: {"domain_enabled": true}\ pulp_scenario_env: {}\ @@ -159,31 +153,17 @@ sudo docker cp pulp:/etc/pulp/certs/pulp_webserver.crt /usr/local/share/ca-certi # Hack: adding pulp CA to certifi.where() CERTIFI=$(python -c 'import certifi; print(certifi.where())') cat /usr/local/share/ca-certificates/pulp_webserver.crt | sudo tee -a "$CERTIFI" > /dev/null -if [[ "$TEST" = "azure" ]]; then - cat /usr/local/share/ca-certificates/azcert.crt | sudo tee -a "$CERTIFI" > /dev/null -fi # Hack: adding pulp CA to default CA file CERT=$(python -c 'import ssl; print(ssl.get_default_verify_paths().openssl_cafile)') -cat "$CERTIFI" | sudo tee -a "$CERT" > /dev/null +cat /usr/local/share/ca-certificates/pulp_webserver.crt | sudo tee -a "$CERT" > /dev/null # Updating certs sudo update-ca-certificates echo ::endgroup:: -# Add our azcert.crt certificate to the container image along with the certificates from certifi -# so that we can use HTTPS with our fake Azure CI. certifi is self-contained and doesn't allow -# extension or modification of the trust store, so we do a weird and hacky thing (above) where we just -# overwrite or append to certifi's trust store behind it's back. -# -# We do this for both the CI host and the CI image. if [[ "$TEST" = "azure" ]]; then - AZCERTIFI=$(/opt/az/bin/python3 -c 'import certifi; print(certifi.where())') - PULPCERTIFI=$(cmd_prefix python3 -c 'import certifi; print(certifi.where())') - cat /usr/local/share/ca-certificates/azcert.crt >> $AZCERTIFI - cat /usr/local/share/ca-certificates/azcert.crt | cmd_stdin_prefix tee -a "$PULPCERTIFI" > /dev/null - cat /usr/local/share/ca-certificates/azcert.crt | cmd_stdin_prefix tee -a /etc/pki/tls/cert.pem > /dev/null - AZURE_STORAGE_CONNECTION_STRING='DefaultEndpointsProtocol=https;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=https://ci-azurite:10000/devstoreaccount1;' + AZURE_STORAGE_CONNECTION_STRING='DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;' az storage container create --name pulp-test --connection-string $AZURE_STORAGE_CONNECTION_STRING fi diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index cca438897..94b8402fb 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -74,7 +74,7 @@ jobs: with: fetch-depth: 0 path: "pulp_rpm" - ref: "3.26" + ref: "3.27" - name: "Run update" working-directory: "pulp_rpm" @@ -88,10 +88,10 @@ jobs: path: "pulp_rpm" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.26" + title: "Update CI files for branch 3.27" body: "" - branch: "update-ci/3.26" - base: "3.26" + branch: "update-ci/3.27" + base: "3.27" commit-message: | Update CI files diff --git a/CHANGES/2909.feature b/CHANGES/2909.feature deleted file mode 100644 index e7a0efc67..000000000 --- a/CHANGES/2909.feature +++ /dev/null @@ -1 +0,0 @@ -Added /rpm/prune/ endpoint to allow "pruning" old Packages from repositories. diff --git a/CHANGES/2986.feature b/CHANGES/2986.feature deleted file mode 100644 index bdc14d442..000000000 --- a/CHANGES/2986.feature +++ /dev/null @@ -1 +0,0 @@ -Added (tech preview) support for signing RPM packages when uploading to a Repository. diff --git a/CHANGES/3572.bugfix b/CHANGES/3572.bugfix deleted file mode 100644 index 0a54dc837..000000000 --- a/CHANGES/3572.bugfix +++ /dev/null @@ -1 +0,0 @@ -Taught tests to find centos8 at vault.centos.org. diff --git a/CHANGES/3587.bugfix b/CHANGES/3587.bugfix deleted file mode 100644 index 8ad037a4b..000000000 --- a/CHANGES/3587.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a flaw that still allowed to add duplicate advisories to a repository version. diff --git a/CHANGES/3599.bugfix b/CHANGES/3599.bugfix deleted file mode 100644 index 60c18bf71..000000000 --- a/CHANGES/3599.bugfix +++ /dev/null @@ -1 +0,0 @@ -Made sync more tolerant of poorly configured webservers. diff --git a/docs/conf.py b/docs/conf.py index 10854b2dc..7f09c16a0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -60,9 +60,9 @@ # built documents. # # The short X.Y version. -version = "3.27.0.dev" +version = "3.28.0.dev" # The full version, including alpha/beta/rc tags. -release = "3.27.0.dev" +release = "3.28.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_rpm/app/__init__.py b/pulp_rpm/app/__init__.py index 84abf4f3f..3324c37e3 100644 --- a/pulp_rpm/app/__init__.py +++ b/pulp_rpm/app/__init__.py @@ -8,6 +8,6 @@ class PulpRpmPluginAppConfig(PulpPluginAppConfig): name = "pulp_rpm.app" label = "rpm" - version = "3.27.0.dev" + version = "3.28.0.dev" python_package_name = "pulp-rpm" domain_compatible = True diff --git a/setup.py b/setup.py index 6898d29af..f5a2ecd76 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="pulp-rpm", - version="3.27.0.dev", + version="3.28.0.dev", description="RPM plugin for the Pulp Project", long_description=long_description, license="GPLv2+", diff --git a/template_config.yml b/template_config.yml index 8ca2d12b6..4170b1316 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-335-gdf91f79 +# generated with plugin_template@2021.08.26-339-gf0d923e api_root: /pulp/ black: true @@ -29,7 +29,7 @@ flake8_ignore: [] github_org: pulp issue_tracker: github kanban: true -latest_release_branch: '3.26' +latest_release_branch: '3.27' lint_requirements: true noissue_marker: '[noissue]' parallel_test_workers: 8