diff --git a/.ci/ansible/settings.py.j2 b/.ci/ansible/settings.py.j2 index 16d3a3a5c5..2dad671128 100644 --- a/.ci/ansible/settings.py.j2 +++ b/.ci/ansible/settings.py.j2 @@ -8,7 +8,7 @@ TOKEN_SIGNATURE_ALGORITHM = "ES256" CACHE_ENABLED = True REDIS_HOST = "localhost" REDIS_PORT = 6379 -TELEMETRY = False +ANALYTICS = False {% if api_root is defined %} API_ROOT = {{ api_root | repr }} diff --git a/.github/template_gitref b/.github/template_gitref index f4f862d8c0..283946e929 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-184-g9a51359 +2021.08.26-187-g287fc4d diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh index 0cbaff2c2d..a89d28bff4 100755 --- a/.github/workflows/scripts/before_install.sh +++ b/.github/workflows/scripts/before_install.sh @@ -111,7 +111,7 @@ fi cd .. -git clone --depth=1 https://github.com/pulp/pulp_ansible.git --branch 0.15.0 +git clone --depth=1 https://github.com/pulp/pulp_ansible.git --branch 0.16.0 cd pulp_ansible if [ -n "$PULP_ANSIBLE_PR_NUMBER" ]; then diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 19376382d0..d24d91f9e5 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -28,7 +28,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.15.0 + PULP_ANSIBLE=git+https://github.com/pulp/pulp_ansible.git@0.16.0 fi if [ -e $REPO_ROOT/../pulp_container ]; then PULP_CONTAINER=./pulp_container diff --git a/requirements/requirements.common.txt b/requirements/requirements.common.txt index 6615fa7c1c..4860fcb1c9 100644 --- a/requirements/requirements.common.txt +++ b/requirements/requirements.common.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile --output-file=requirements/requirements.common.txt setup.py # @@ -232,7 +232,7 @@ protobuf==4.21.7 # via pulpcore psycopg2==2.9.4 # via pulpcore -pulp-ansible==0.15.0 +pulp-ansible==0.16.0 # via galaxy-ng (setup.py) pulp-container==2.14.1 # via galaxy-ng (setup.py) diff --git a/requirements/requirements.insights.txt b/requirements/requirements.insights.txt index 0633771907..179155eff9 100644 --- a/requirements/requirements.insights.txt +++ b/requirements/requirements.insights.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile --output-file=requirements/requirements.insights.txt requirements/requirements.insights.in setup.py # @@ -252,7 +252,7 @@ protobuf==4.21.7 # via pulpcore psycopg2==2.9.4 # via pulpcore -pulp-ansible==0.15.0 +pulp-ansible==0.16.0 # via galaxy-ng (setup.py) pulp-container==2.14.1 # via galaxy-ng (setup.py) diff --git a/requirements/requirements.standalone.txt b/requirements/requirements.standalone.txt index 59db7a9080..a40ecbba15 100644 --- a/requirements/requirements.standalone.txt +++ b/requirements/requirements.standalone.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile --output-file=requirements/requirements.standalone.txt requirements/requirements.standalone.in setup.py # @@ -232,7 +232,7 @@ protobuf==4.21.7 # via pulpcore psycopg2==2.9.4 # via pulpcore -pulp-ansible==0.15.0 +pulp-ansible==0.16.0 # via galaxy-ng (setup.py) pulp-container==2.14.1 # via galaxy-ng (setup.py) diff --git a/setup.py b/setup.py index e7ffa2bb22..5e69b93327 100644 --- a/setup.py +++ b/setup.py @@ -113,7 +113,7 @@ def _format_pulp_requirement(plugin, specifier=None, ref=None, gh_namespace="pul requirements = [ "galaxy-importer>=0.4.6,<0.5.0", "pulpcore>=3.21.3,<3.22.0", - "pulp_ansible>=0.15.0,<0.16.0", + "pulp_ansible>=0.16.0,<0.17.0", "django-prometheus>=2.0.0", "drf-spectacular", "pulp-container>=2.14.1,<2.15.0", diff --git a/template_config.yml b/template_config.yml index b6dcbd9297..39c001acfb 100644 --- a/template_config.yml +++ b/template_config.yml @@ -5,7 +5,7 @@ additional_repos: - bindings: true - branch: 0.15.0 + branch: 0.16.0 name: pulp_ansible org: pulp - bindings: true