Skip to content

Commit

Permalink
Update CI files
Browse files Browse the repository at this point in the history
[noissue]
  • Loading branch information
pulpbot committed Jul 25, 2024
1 parent e267f44 commit 2cf1ebb
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 125 deletions.
7 changes: 5 additions & 2 deletions .ci/ansible/Containerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ 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
RUN pip3 install --upgrade pip setuptools wheel && \
rm -rf /root/.cache/pip && \
pip3 install
{%- if s3_test | default(false) -%}
{{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue
{%- endif -%}
Expand All @@ -25,7 +27,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() %}
Expand Down
2 changes: 2 additions & 0 deletions .ci/scripts/calc_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ def to_upper_bound(req):
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}"
Expand Down
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-354-g82d22de
2021.08.26-364-g6f9579c
103 changes: 0 additions & 103 deletions .github/workflows/kanban.yml

This file was deleted.

4 changes: 1 addition & 3 deletions .github/workflows/scripts/build_python_client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
pushd ../pulp-openapi-generator
rm -rf "pulp_container-client"

# We need to copy that over to be visible in the container.
cp "../pulp_container/container-api.json" .
./gen-client.sh "container-api.json" "container" python "pulp_container"
./gen-client.sh "../pulp_container/container-api.json" "container" python "pulp_container"

pushd pulp_container-client
python setup.py sdist bdist_wheel --python-tag py3
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/scripts/build_ruby_client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
pushd ../pulp-openapi-generator
rm -rf "pulp_container-client"

# We need to copy that over to be visible in the container.
#cp "../pulp_container/container-api.json" .
#./gen-client.sh "container-api.json" "container" ruby "pulp_container"

# -------------
# The generator still needs to have it called api.json at this time...
cp "../pulp_container/api.json" .
./gen-client.sh "api.json" "container" ruby "pulp_container"
# -------------
./gen-client.sh "../pulp_container/container-api.json" "container" ruby "pulp_container"

pushd pulp_container-client
gem build pulp_container_client
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
matrix:
env:
- TEST: pulp
- TEST: docs
- TEST: azure
- TEST: s3
- TEST: lowerbounds
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ name: "Container 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 3:30 UTC every Sunday
- cron: '30 3 * * 0'
workflow_dispatch:

jobs:
Expand Down
7 changes: 3 additions & 4 deletions template_config.yml
Original file line number Diff line number Diff line change
@@ -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-354-g82d22de
# generated with plugin_template@2021.08.26-364-g6f9579c

api_root: /pulp/
black: true
Expand All @@ -12,7 +12,7 @@ check_stray_pulpcore_imports: true
ci_base_image: ghcr.io/pulp/pulp-ci-centos9
ci_env: {}
ci_trigger: '{pull_request: {branches: [''*'']}}'
ci_update_docs: true
ci_update_docs: false
cli_package: pulp-cli
cli_repo: https://github.com/pulp/pulp-cli.git
core_import_allowed: []
Expand All @@ -22,12 +22,11 @@ deploy_to_pypi: true
disabled_redis_runners: []
doc_requirements_from_pulpcore: false
docker_fixtures: false
docs_test: true
docs_test: false
flake8: true
flake8_ignore: []
github_org: pulp
issue_tracker: github
kanban: true
latest_release_branch: '2.20'
lint_requirements: true
noissue_marker: '[noissue]'
Expand Down

0 comments on commit 2cf1ebb

Please sign in to comment.