Skip to content

Commit 689f19c

Browse files
committed
Update CI files
1 parent d297bc4 commit 689f19c

7 files changed

Lines changed: 86 additions & 51 deletions

File tree

.ci/assets/ci_constraints.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Pulpcore versions without the openapi command do no longer work in the CI
2-
pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.*,!=3.31.*,!=3.32.*,!=3.33.*,!=3.34.*,!=3.35.*,!=3.36.*,!=3.37.*,!=3.38.*,!=3.40.*,!=3.41.*,!=3.42.*,!=3.43.*,!=3.44.*,!=3.45.*,!=3.46.*,!=3.47.*,!=3.48.*,!=3.50.*,!=3.51.*,!=3.52.*,!=3.53.*,!=3.54.*
2+
# Pulpcore versions without the django 5 storage compatibility will fail, >3.63,<3.70
3+
pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.*,!=3.31.*,!=3.32.*,!=3.33.*,!=3.34.*,!=3.35.*,!=3.36.*,!=3.37.*,!=3.38.*,!=3.40.*,!=3.41.*,!=3.42.*,!=3.43.*,!=3.44.*,!=3.45.*,!=3.46.*,!=3.47.*,!=3.48.*,!=3.50.*,!=3.51.*,!=3.52.*,!=3.53.*,!=3.54.*,!=3.64.*,!=3.65.*,!=3.66.*,!=3.67.*,!=3.68.*,!=3.69.*
34

45

56
tablib!=3.6.0
@@ -8,3 +9,11 @@ tablib!=3.6.0
89

910
multidict!=6.3.0
1011
# This release failed the lower bounds test for some case sensitivity in CIMultiDict.
12+
13+
14+
azure-storage-blob!=12.28.*
15+
# Apparently does not work with current azurite.
16+
17+
18+
pycares<5
19+
# older aiodns versions don't pin pycares UB, and are broken by pycares>=5

.ci/scripts/check_release.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
#!/usr/bin/env python
2+
# /// script
3+
# requires-python = ">=3.13"
4+
# dependencies = [
5+
# "gitpython>=3.1.46,<3.2.0",
6+
# "packaging>=26.0,<26.1",
7+
# "pyyaml>=6.0.3,<6.1.0",
8+
# ]
9+
# ///
210

311
import argparse
412
import re
513
import os
614
import tomllib
7-
import yaml
815
from pathlib import Path
16+
17+
import yaml
918
from packaging.version import Version
1019
from git import Repo
1120

.github/pull_request_template.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!---
2+
Thank you for submitting a PR to the Pulp Project!
3+
4+
If this is your first time contributing, please read the Pull Request Walkthrough documentation
5+
(https://pulpproject.org/pulpcore/docs/dev/guides/pull-request-walkthrough/).
6+
-->
7+
8+
### 📜 Checklist
9+
10+
- [ ] Commits are cleanly separated with meaningful messages (simple features and bug fixes should be [squashed](https://pulpproject.org/pulpcore/docs/dev/guides/git/#rebasing-and-squashing) to one commit)
11+
- [ ] A [changelog entry](https://pulpproject.org/pulpcore/docs/dev/guides/git/#changelog-update) or entries has been added for any significant changes
12+
- [ ] Follows the [Pulp policy on AI Usage](https://pulpproject.org/help/more/governance/ai_policy/)
13+
- [ ] (For new features) - User documentation and test coverage has been added
14+
15+
See: [Pull Request Walkthrough](https://pulpproject.org/pulpcore/docs/dev/guides/pull-request-walkthrough/)

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ jobs:
9494
run_docs: ${{ needs.check-changes.outputs.run_docs }}
9595

9696
lint:
97-
needs:
98-
- "check-changes"
99-
if: needs.check-changes.outputs.run_tests == '1'
10097
uses: "./.github/workflows/lint.yml"
10198

10299
build:
103-
needs: "lint"
100+
needs:
101+
- "check-changes"
102+
- "lint"
103+
if: needs.check-changes.outputs.run_tests == '1'
104104
uses: "./.github/workflows/build.yml"
105105

106106
test:

.github/workflows/scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ if [ "$TEST" = "azure" ]; then
107107
image: mcr.microsoft.com/azure-storage/azurite\
108108
volumes:\
109109
- ./azurite:/etc/pulp\
110-
command: "azurite-blob --blobHost 0.0.0.0"' vars/main.yaml
110+
command: "azurite-blob --skipApiVersionCheck --blobHost 0.0.0.0"' vars/main.yaml
111111
sed -i -e '$a azure_test: true\
112112
pulp_scenario_settings: {"AZURE_ACCOUNT_KEY": "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==", "AZURE_ACCOUNT_NAME": "devstoreaccount1", "AZURE_CONNECTION_STRING": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;", "AZURE_CONTAINER": "pulp-test", "AZURE_LOCATION": "pulp3", "AZURE_OVERWRITE_FILES": true, "AZURE_URL_EXPIRATION_SECS": 120, "DEFAULT_FILE_STORAGE": "storages.backends.azure_storage.AzureStorage", "MEDIA_ROOT": ""}\
113113
pulp_scenario_env: {}\

.github/workflows/scripts/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ else
144144
fi
145145
pushd ../pulp-cli
146146
pip install -r test_requirements.txt
147-
pytest -v -m "pulp_container"
147+
pytest -v tests -m "pulp_container"
148148
popd
149149

150150
if [ -f "$POST_SCRIPT" ]; then

template_config.yml

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
# were not present before running plugin-template have been added with their default values.
33

44
# generated with plugin_template
5+
#
6+
# After editing this file please always reapply the plugin template before committing any changes.
57

6-
api_root: /pulp/
8+
---
9+
api_root: "/pulp/"
710
black: true
811
check_commit_message: true
912
check_gettext: true
1013
check_manifest: true
1114
check_stray_pulpcore_imports: true
12-
ci_base_image: ghcr.io/pulp/pulp-ci-centos
15+
ci_base_image: "ghcr.io/pulp/pulp-ci-centos"
1316
ci_env: {}
14-
ci_trigger: '{pull_request: {branches: [''*'']}}'
15-
cli_package: pulp-cli
16-
cli_repo: https://github.com/pulp/pulp-cli.git
17+
ci_trigger: "{pull_request: {branches: ['*']}}"
18+
cli_package: "pulp-cli"
19+
cli_repo: "https://github.com/pulp/pulp-cli.git"
1720
core_import_allowed: []
1821
deploy_client_to_pypi: true
1922
deploy_client_to_rubygems: true
@@ -23,68 +26,66 @@ docker_fixtures: false
2326
extra_files: []
2427
flake8: true
2528
flake8_ignore: []
26-
github_org: pulp
29+
github_org: "pulp"
2730
latest_release_branch: null
2831
lint_requirements: true
2932
os_required_packages: []
3033
parallel_test_workers: 8
31-
plugin_app_label: container
32-
plugin_default_branch: main
33-
plugin_name: pulp_container
34+
plugin_app_label: "container"
35+
plugin_default_branch: "main"
36+
plugin_name: "pulp_container"
3437
plugins:
35-
- app_label: container
36-
name: pulp_container
37-
post_job_template: null
38-
pre_job_template: null
38+
- app_label: "container"
39+
name: "pulp_container"
3940
pulp_env: {}
4041
pulp_env_azure: {}
4142
pulp_env_gcp: {}
4243
pulp_env_s3: {}
43-
pulp_scheme: https
44+
pulp_scheme: "https"
4445
pulp_settings:
4546
allowed_content_checksums:
46-
- sha1
47-
- sha224
48-
- sha256
49-
- sha384
50-
- sha512
47+
- "sha1"
48+
- "sha224"
49+
- "sha256"
50+
- "sha384"
51+
- "sha512"
5152
allowed_export_paths:
52-
- /tmp
53+
- "/tmp"
5354
allowed_import_paths:
54-
- /tmp
55+
- "/tmp"
5556
pulp_settings_azure:
56-
AZURE_ACCOUNT_KEY: Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==
57-
AZURE_ACCOUNT_NAME: devstoreaccount1
58-
AZURE_CONNECTION_STRING: DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;
59-
AZURE_CONTAINER: pulp-test
60-
AZURE_LOCATION: pulp3
57+
AZURE_ACCOUNT_KEY: "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
58+
AZURE_ACCOUNT_NAME: "devstoreaccount1"
59+
AZURE_CONNECTION_STRING: "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://ci-azurite:10000/devstoreaccount1;"
60+
AZURE_CONTAINER: "pulp-test"
61+
AZURE_LOCATION: "pulp3"
6162
AZURE_OVERWRITE_FILES: true
6263
AZURE_URL_EXPIRATION_SECS: 120
63-
DEFAULT_FILE_STORAGE: storages.backends.azure_storage.AzureStorage
64-
MEDIA_ROOT: ''
64+
DEFAULT_FILE_STORAGE: "storages.backends.azure_storage.AzureStorage"
65+
MEDIA_ROOT: ""
6566
pulp_settings_gcp: null
6667
pulp_settings_s3:
67-
AWS_ACCESS_KEY_ID: AKIAIT2Z5TDYPX3ARJBA
68-
AWS_DEFAULT_ACL: '@none None'
69-
AWS_S3_ADDRESSING_STYLE: path
70-
AWS_S3_ENDPOINT_URL: http://minio:9000
71-
AWS_S3_REGION_NAME: eu-central-1
72-
AWS_S3_SIGNATURE_VERSION: s3v4
73-
AWS_SECRET_ACCESS_KEY: fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS
74-
AWS_STORAGE_BUCKET_NAME: pulp3
75-
DEFAULT_FILE_STORAGE: storages.backends.s3boto3.S3Boto3Storage
76-
MEDIA_ROOT: ''
68+
AWS_ACCESS_KEY_ID: "AKIAIT2Z5TDYPX3ARJBA"
69+
AWS_DEFAULT_ACL: "@none None"
70+
AWS_S3_ADDRESSING_STYLE: "path"
71+
AWS_S3_ENDPOINT_URL: "http://minio:9000"
72+
AWS_S3_REGION_NAME: "eu-central-1"
73+
AWS_S3_SIGNATURE_VERSION: "s3v4"
74+
AWS_SECRET_ACCESS_KEY: "fqRvjWaPU5o0fCqQuUWbj9Fainj2pVZtBCiDiieS"
75+
AWS_STORAGE_BUCKET_NAME: "pulp3"
76+
DEFAULT_FILE_STORAGE: "storages.backends.s3boto3.S3Boto3Storage"
77+
MEDIA_ROOT: ""
7778
pydocstyle: true
78-
release_email: pulp-infra@redhat.com
79-
release_user: pulpbot
79+
release_email: "pulp-infra@redhat.com"
80+
release_user: "pulpbot"
8081
stalebot: true
8182
stalebot_days_until_close: 30
8283
stalebot_days_until_stale: 90
8384
stalebot_limit_to_pulls: true
8485
supported_release_branches:
85-
- '2.9'
86-
- '2.10'
87-
- '2.14'
86+
- "2.9"
87+
- "2.10"
88+
- "2.14"
8889
sync_ci: true
8990
test_azure: true
9091
test_cli: true
@@ -95,4 +96,5 @@ test_performance: false
9596
test_reroute: true
9697
test_s3: true
9798
use_issue_template: true
99+
...
98100

0 commit comments

Comments
 (0)