Skip to content

Commit

Permalink
Use v3/excludes to exclude content from sync (#1311)
Browse files Browse the repository at this point in the history
Issue: AAH-1583
  • Loading branch information
awcrosby committed Jun 16, 2022
1 parent 4e18663 commit 7ac013e
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 86 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scripts/before_install.sh
Expand Up @@ -122,7 +122,7 @@ fi
cd ..


git clone --depth=1 https://github.com/pulp/pulp_ansible.git --branch 0.10.2
git clone --depth=1 https://github.com/pulp/pulp_ansible.git --branch 0.10.3
cd pulp_ansible

if [ -n "$PULP_ANSIBLE_PR_NUMBER" ]; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/install.sh
Expand Up @@ -29,7 +29,7 @@ TAG=ci_build
if [ -e $REPO_ROOT/../pulp_ansible ]; then
PULP_ANSIBLE=./pulp_ansible
else
PULP_ANSIBLE=git+https://github.com/pulp/pulp_ansible.git@0.10.2
PULP_ANSIBLE=git+https://github.com/pulp/pulp_ansible.git@0.10.3
fi

if [ -e $REPO_ROOT/../pulp_container ]; then
Expand Down
64 changes: 0 additions & 64 deletions .github/workflows/scripts/stage-changelog-for-master.py

This file was deleted.

1 change: 1 addition & 0 deletions CHANGES/1583.bugfix
@@ -0,0 +1 @@
Use v3/excludes to exclude content from sync
11 changes: 5 additions & 6 deletions requirements/requirements.common.txt
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.9
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
#
# pip-compile --output-file=requirements/requirements.common.txt setup.py
Expand Down Expand Up @@ -156,7 +156,7 @@ jinja2==3.0.1
# via
# ansible-core
# pulpcore
jsonschema==3.2.0
jsonschema==4.6.0
# via
# drf-spectacular
# pulp-ansible
Expand All @@ -182,7 +182,7 @@ odfpy==1.4.1
# via tablib
openpyxl==3.0.7
# via tablib
packaging==21.0
packaging==21.3
# via
# ansible-core
# ansible-lint
Expand All @@ -196,7 +196,7 @@ prometheus-client==0.11.0
# via django-prometheus
psycopg2==2.9.1
# via pulpcore
pulp-ansible==0.10.2
pulp-ansible==0.10.3
# via galaxy-ng (setup.py)
pulp-container==2.8.6
# via galaxy-ng (setup.py)
Expand Down Expand Up @@ -273,14 +273,13 @@ ruamel-yaml==0.17.21
# via ansible-lint
ruamel-yaml-clib==0.2.6
# via ruamel-yaml
semantic-version==2.8.5
semantic-version==2.10.0
# via
# galaxy-importer
# pulp-ansible
six==1.16.0
# via
# bleach
# jsonschema
# pyjwkest
# social-auth-app-django
# social-auth-core
Expand Down
11 changes: 5 additions & 6 deletions requirements/requirements.insights.txt
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.9
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
#
# pip-compile --output-file=requirements/requirements.insights.txt requirements/requirements.insights.in setup.py
Expand Down Expand Up @@ -174,7 +174,7 @@ jmespath==0.10.0
# via
# boto3
# botocore
jsonschema==3.2.0
jsonschema==4.6.0
# via
# drf-spectacular
# pulp-ansible
Expand Down Expand Up @@ -202,7 +202,7 @@ odfpy==1.4.1
# via tablib
openpyxl==3.0.7
# via tablib
packaging==21.0
packaging==21.3
# via
# ansible-core
# ansible-lint
Expand All @@ -216,7 +216,7 @@ prometheus-client==0.11.0
# via django-prometheus
psycopg2==2.9.1
# via pulpcore
pulp-ansible==0.10.2
pulp-ansible==0.10.3
# via galaxy-ng (setup.py)
pulp-container==2.8.6
# via galaxy-ng (setup.py)
Expand Down Expand Up @@ -297,14 +297,13 @@ ruamel-yaml-clib==0.2.6
# via ruamel-yaml
s3transfer==0.5.0
# via boto3
semantic-version==2.8.5
semantic-version==2.10.0
# via
# galaxy-importer
# pulp-ansible
six==1.16.0
# via
# bleach
# jsonschema
# pyjwkest
# python-dateutil
# social-auth-app-django
Expand Down
11 changes: 5 additions & 6 deletions requirements/requirements.standalone.txt
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.9
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
#
# pip-compile --output-file=requirements/requirements.standalone.txt requirements/requirements.standalone.in setup.py
Expand Down Expand Up @@ -156,7 +156,7 @@ jinja2==3.0.1
# via
# ansible-core
# pulpcore
jsonschema==3.2.0
jsonschema==4.6.0
# via
# drf-spectacular
# pulp-ansible
Expand All @@ -182,7 +182,7 @@ odfpy==1.4.1
# via tablib
openpyxl==3.0.7
# via tablib
packaging==21.0
packaging==21.3
# via
# ansible-core
# ansible-lint
Expand All @@ -196,7 +196,7 @@ prometheus-client==0.11.0
# via django-prometheus
psycopg2==2.9.1
# via pulpcore
pulp-ansible==0.10.2
pulp-ansible==0.10.3
# via galaxy-ng (setup.py)
pulp-container==2.8.6
# via galaxy-ng (setup.py)
Expand Down Expand Up @@ -273,14 +273,13 @@ ruamel-yaml==0.17.21
# via ansible-lint
ruamel-yaml-clib==0.2.6
# via ruamel-yaml
semantic-version==2.8.5
semantic-version==2.10.0
# via
# galaxy-importer
# pulp-ansible
six==1.16.0
# via
# bleach
# jsonschema
# pyjwkest
# social-auth-app-django
# social-auth-core
Expand Down
3 changes: 1 addition & 2 deletions template_config.yml
Expand Up @@ -5,7 +5,7 @@

additional_repos:
- bindings: true
branch: 0.10.2
branch: 0.10.3
name: pulp_ansible
org: pulp
- bindings: true
Expand Down Expand Up @@ -97,4 +97,3 @@ update_github: true
update_redmine: false
upgrade_range: []
use_issue_template: true

0 comments on commit 7ac013e

Please sign in to comment.