From 8b0ba77a9b5d8bf5e44b58d14cc77fb29235116b Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 12 Mar 2023 02:57:54 +0000 Subject: [PATCH] Update CI files [noissue] --- .ci/ansible/Containerfile.j2 | 9 ++++- .ci/ansible/settings.py.j2 | 9 ++++- .ci/ansible/start_container.yaml | 2 + .ci/assets/release_requirements.txt | 1 - .ci/scripts/calc_deps_lowerbounds.py | 41 +++++++++++++++++++++ .ci/scripts/check_gettext.sh | 1 - .github/template_gitref | 2 +- .github/workflows/ci.yml | 6 ++- .github/workflows/nightly.yml | 28 +------------- .github/workflows/release.yml | 7 ++-- .github/workflows/scripts/before_install.sh | 19 +++++++--- .github/workflows/scripts/before_script.sh | 8 +++- .github/workflows/scripts/install.sh | 15 +++++++- .github/workflows/scripts/release.py | 9 ++--- .github/workflows/scripts/script.sh | 29 ++++++++------- .github/workflows/scripts/utils.sh | 10 +++++ .github/workflows/update_ci.yml | 2 +- lint_requirements.txt | 7 ++++ template_config.yml | 5 ++- 19 files changed, 142 insertions(+), 68 deletions(-) create mode 100755 .ci/scripts/calc_deps_lowerbounds.py diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2 index d61722b0..72491d9b 100644 --- a/.ci/ansible/Containerfile.j2 +++ b/.ci/ansible/Containerfile.j2 @@ -20,6 +20,9 @@ RUN pip3 install \ {%- if azure_test | default(false) -%} {{ " " }}django-storages[azure]>=1.12.2 {%- endif -%} +{%- if gcp_test | default(false) -%} +{{ " " }}django-storages[google]>=1.13.2 +{%- endif -%} {%- for item in plugins -%} {%- if item.name == "pulp-certguard" -%} {{ " " }}python-dateutil rhsm @@ -27,7 +30,11 @@ RUN pip3 install \ {{ " " }}"{{ item.source }}" {%- endfor %} -RUN mkdir -p /etc/nginx/pulp/ +USER pulp:pulp +RUN PULP_STATIC_ROOT=/var/lib/operator/static/ PULP_CONTENT_ORIGIN=localhost \ + /usr/local/bin/pulpcore-manager collectstatic --clear --noinput --link +USER root:root + {% for item in plugins %} RUN export plugin_path="$(pip3 show {{ item.name }} | sed -n -e 's/Location: //p')/{{ item.name }}" && \ ln $plugin_path/app/webserver_snippets/nginx.conf /etc/nginx/pulp/{{ item.name }}.conf || true diff --git a/.ci/ansible/settings.py.j2 b/.ci/ansible/settings.py.j2 index 16d3a3a5..9470aafa 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 }} @@ -63,3 +63,10 @@ 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;' {% endif %} + +{% if gcp_test | default(false) %} +DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage" +MEDIA_ROOT = "" +GS_BUCKET_NAME = "gcppulp" +GS_CUSTOM_ENDPOINT = "http://ci-gcp:4443" +{% endif %} diff --git a/.ci/ansible/start_container.yaml b/.ci/ansible/start_container.yaml index e23a1880..a05edc0b 100644 --- a/.ci/ansible/start_container.yaml +++ b/.ci/ansible/start_container.yaml @@ -19,6 +19,8 @@ community.crypto.openssh_keypair: path: ssh/id_ed25519 type: ed25519 + owner: 700 # pulp in the container + become: true when: stream_test | default(false) - name: "Generate Pulp Settings" diff --git a/.ci/assets/release_requirements.txt b/.ci/assets/release_requirements.txt index d1dfa7c8..c064e947 100644 --- a/.ci/assets/release_requirements.txt +++ b/.ci/assets/release_requirements.txt @@ -1,4 +1,3 @@ bump2version gitpython -python-redmine towncrier diff --git a/.ci/scripts/calc_deps_lowerbounds.py b/.ci/scripts/calc_deps_lowerbounds.py new file mode 100755 index 00000000..7dab6369 --- /dev/null +++ b/.ci/scripts/calc_deps_lowerbounds.py @@ -0,0 +1,41 @@ +# WARNING: DO NOT EDIT! +# +# This file was generated by plugin_template, and is managed by it. Please use +# './plugin-template --github pulp_file' to update this file. +# +# For more info visit https://github.com/pulp/plugin_template + +from packaging.requirements import Requirement + + +# We install these from source, but it would be really handy if we could test pulpcore +# compatibility that way too. +EXCEPTIONS = [ + "pulpcore", + "pulp-certguard".replace("-", "_"), +] + + +def main(): + """Calculate the lower bound of dependencies where possible.""" + with open("requirements.txt") as req_file: + for line in req_file: + try: + requirement = Requirement(line) + except ValueError: + print(line.strip()) + else: + if requirement.name.replace("-", "_") in EXCEPTIONS: + print(line.strip()) + else: + for spec in requirement.specifier: + if spec.operator == ">=": + min_version = str(spec)[2:] + print(f"{requirement.name}=={min_version}") + break + else: + print(line.strip()) + + +if __name__ == "__main__": + main() diff --git a/.ci/scripts/check_gettext.sh b/.ci/scripts/check_gettext.sh index ae69a727..5f90ca96 100755 --- a/.ci/scripts/check_gettext.sh +++ b/.ci/scripts/check_gettext.sh @@ -12,7 +12,6 @@ cd "$(dirname "$(realpath -e "$0")")"/../.. set -uv -# check for imports not from pulpcore.plugin. exclude tests MATCHES=$(grep -n -r --include \*.py "_(f") if [ $? -ne 1 ]; then diff --git a/.github/template_gitref b/.github/template_gitref index dcfc2469..0748c9de 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-174-g56e0727 +2021.08.26-197-g21230dd diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec7702d9..e7e096be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,11 +98,13 @@ jobs: - TEST: azure - TEST: s3 - TEST: stream + - TEST: lowerbounds outputs: deprecations-pulp: ${{ steps.deprecations.outputs.deprecations-pulp }} deprecations-stream: ${{ steps.deprecations.outputs.deprecations-stream }} deprecations-azure: ${{ steps.deprecations.outputs.deprecations-azure }} deprecations-s3: ${{ steps.deprecations.outputs.deprecations-s3 }} + deprecations-lowerbounds: ${{ steps.deprecations.outputs.deprecations-lowerbounds }} steps: - uses: actions/checkout@v3 @@ -196,7 +198,7 @@ jobs: - name: Extract Deprecations from Logs id: deprecations - run: echo "::set-output name=deprecations-${{ matrix.env.TEST }}::$(docker logs pulp 2>&1 | grep -i pulpcore.deprecation | base64 -w 0)" + run: echo deprecations-${{ matrix.env.TEST }}=$(docker logs pulp 2>&1 | grep -i pulpcore.deprecation | base64 -w 0) >> $GITHUB_OUTPUT - name: Logs if: always() @@ -220,6 +222,7 @@ jobs: test -z "${{ needs.test.outputs.deprecations-stream }}" test -z "${{ needs.test.outputs.deprecations-azure }}" test -z "${{ needs.test.outputs.deprecations-s3 }}" + test -z "${{ needs.test.outputs.deprecations-lowerbounds }}" - name: Print deprecations if: failure() run: | @@ -227,5 +230,6 @@ jobs: echo "${{ needs.test.outputs.deprecations-stream }}" | base64 -d echo "${{ needs.test.outputs.deprecations-azure }}" | base64 -d echo "${{ needs.test.outputs.deprecations-s3 }}" | base64 -d + echo "${{ needs.test.outputs.deprecations-lowerbounds }}" | base64 -d diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2f0e3202..ec0083d6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -27,8 +27,10 @@ jobs: - TEST: azure - TEST: s3 - TEST: stream + - TEST: generate-bindings - TEST: plugin-from-pypi + - TEST: lowerbounds steps: - uses: actions/checkout@v3 @@ -312,32 +314,6 @@ jobs: SECRETS_CONTEXT: ${{ toJson(secrets) }} - - name: Download Ruby client - uses: actions/download-artifact@v3 - with: - name: ruby-client.tar - - - name: Untar Ruby client packages - run: tar -xvf ruby-client.tar - - - name: Publish client to rubygems - run: bash .github/workflows/scripts/publish_client_gem.sh - - - - - name: Download Python client - uses: actions/download-artifact@v3 - with: - name: python-client.tar - - - name: Untar python client packages - run: tar -xvf python-client.tar - - - name: Publish client to pypi - run: bash .github/workflows/scripts/publish_client_pypi.sh - - - - name: Download built docs uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89a8cefb..d3a77c3a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: - name: Install python dependencies run: | echo ::group::PYDEPS - pip install bandersnatch bump2version gitpython python-redmine towncrier==19.9.0 wheel + pip install packaging~=21.3 bandersnatch bump2version gitpython towncrier==19.9.0 wheel echo ::endgroup:: - name: Configure Git with pulpbot name and email @@ -86,6 +86,7 @@ jobs: - TEST: s3 - TEST: stream - TEST: generate-bindings + - TEST: lowerbounds steps: - uses: actions/download-artifact@v3 @@ -293,7 +294,7 @@ jobs: - name: Install python dependencies run: | echo ::group::PYDEPS - pip install gitpython python-redmine requests packaging tweepy + pip install gitpython requests packaging~=21.3 tweepy echo ::endgroup:: - name: Push branch and tag to GitHub @@ -335,8 +336,6 @@ jobs: - name: Publish client to rubygems run: bash .github/workflows/scripts/publish_client_gem.sh - - - name: Update GitHub continue-on-error: true run: | diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh index b6f0bf18..da689fdc 100755 --- a/.github/workflows/scripts/before_install.sh +++ b/.github/workflows/scripts/before_install.sh @@ -95,17 +95,19 @@ if [ -n "$PULP_OPENAPI_GENERATOR_PR_NUMBER" ]; then fi -git clone --depth=1 https://github.com/pulp/pulp-cli.git +git clone https://github.com/pulp/pulp-cli.git +cd pulp-cli if [ -n "$PULP_CLI_PR_NUMBER" ]; then - cd pulp-cli git fetch origin pull/$PULP_CLI_PR_NUMBER/head:$PULP_CLI_PR_NUMBER git checkout $PULP_CLI_PR_NUMBER - cd .. + pip install . ./pulp-glue +else + pip install pulp-cli + PULP_CLI_VERSION="$(python -c "from pulpcore.cli.common import __version__; print(__version__)")" + git checkout "$PULP_CLI_VERSION" fi -cd pulp-cli -pip install . -pulp config create --base-url https://pulp --location tests/cli.toml +pulp config create --base-url https://pulp --location tests/cli.toml mkdir ~/.config/pulp cp tests/cli.toml ~/.config/pulp/cli.toml cd .. @@ -147,6 +149,11 @@ fi cd pulp_file +if [[ "$TEST" = "lowerbounds" ]]; then + python3 .ci/scripts/calc_deps_lowerbounds.py > lowerbounds_requirements.txt + mv lowerbounds_requirements.txt requirements.txt +fi + if [ -f $POST_BEFORE_INSTALL ]; then source $POST_BEFORE_INSTALL fi diff --git a/.github/workflows/scripts/before_script.sh b/.github/workflows/scripts/before_script.sh index 914a2838..efe2ca64 100755 --- a/.github/workflows/scripts/before_script.sh +++ b/.github/workflows/scripts/before_script.sh @@ -29,10 +29,14 @@ tail -v -n +1 .ci/ansible/vars/main.yaml echo "PULP CONFIG:" tail -v -n +1 .ci/ansible/settings/settings.* ~/.config/pulp_smash/settings.json -SCENARIOS=("pulp" "performance" "azure" "s3" "stream" "plugin-from-pypi" "generate-bindings") +# Needed for some functional tests +cmd_prefix bash -c "echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/nopasswd" +cmd_prefix bash -c "usermod -a -G wheel pulp" + +SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "stream" "plugin-from-pypi" "generate-bindings" "lowerbounds") if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then # Many functional tests require these - cmd_prefix dnf install -yq lsof which dnf-plugins-core + cmd_prefix dnf install -yq lsof which fi if [[ "${REDIS_DISABLED:-false}" == true ]]; then diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 48a2e5d8..9d34c8ac 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -79,7 +79,7 @@ services: volumes: - ./settings:/etc/pulp - ./ssh:/keys/ - - ~/.config:/root/.config + - ~/.config:/var/lib/pulp/.config - ../../../pulp-openapi-generator:/root/pulp-openapi-generator env: PULP_WORKERS: "4" @@ -93,12 +93,14 @@ pulp_container_tag: https VARSYAML -SCENARIOS=("pulp" "performance" "azure" "s3" "stream" "plugin-from-pypi" "generate-bindings") +SCENARIOS=("pulp" "performance" "azure" "gcp" "s3" "stream" "plugin-from-pypi" "generate-bindings" "lowerbounds") if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then sed -i -e '/^services:/a \ - name: pulp-fixtures\ image: docker.io/pulp/pulp-fixtures:latest\ env: {BASE_URL: "http://pulp-fixtures:8080"}' vars/main.yaml + + export REMOTE_FIXTURES_ORIGIN="http://pulp-fixtures:8080" fi if [ "$TEST" == 'stream' ]; then sed -i -e '/^services:/a \ @@ -156,6 +158,15 @@ fi ansible-playbook build_container.yaml ansible-playbook start_container.yaml + +# .config needs to be accessible by the pulp user in the container, but some +# files will likely be modified on the host by post/pre scripts. +chmod 777 ~/.config/pulp_smash/ +chmod 666 ~/.config/pulp_smash/settings.json +sudo chown -R 700:700 ~runner/.config +# Plugins often write to ~/.config/pulp/cli.toml from the host +sudo chmod 777 ~runner/.config/pulp +sudo chmod 666 ~runner/.config/pulp/cli.toml echo ::group::SSL # Copy pulp CA sudo docker cp pulp:/etc/pulp/certs/pulp_webserver.crt /usr/local/share/ca-certificates/pulp_webserver.crt diff --git a/.github/workflows/scripts/release.py b/.github/workflows/scripts/release.py index 4b54f688..ee2c009e 100755 --- a/.github/workflows/scripts/release.py +++ b/.github/workflows/scripts/release.py @@ -79,9 +79,7 @@ def create_release_commits(repo, release_version, plugin_path): git.add(f"{plugin_path}/setup.py") git.add(f"{plugin_path}/requirements.txt") git.add(f"{plugin_path}/.bumpversion.cfg") - git.commit("-m", f"Release {release_version}\nGH Issues: {issues}\n\n[noissue]") - sha = repo.head.object.hexsha short_sha = git.rev_parse(sha, short=7) @@ -101,7 +99,6 @@ def create_release_commits(repo, release_version, plugin_path): git.add(f"{plugin_path}/requirements.txt") git.add(f"{plugin_path}/.bumpversion.cfg") git.commit("-m", f"Bump to {new_dev_version}\n\n[noissue]") - print(f"Release commit == {short_sha}") print(f"All changes were committed on branch: release_{release_version}") return sha @@ -122,8 +119,8 @@ def create_tag_and_build_package(repo, desired_tag, commit_sha, plugin_path): tag = existing_tag else: raise RuntimeError( - "The '{desired_tag}' tag already exists, but the commit sha does not match " - "'{commit_sha}'." + f"The '{desired_tag}' tag already exists, but the commit sha does not match " + f"'{commit_sha}'." ) # Create a tag if one does not exist @@ -138,7 +135,7 @@ def create_tag_and_build_package(repo, desired_tag, commit_sha, plugin_path): loop = asyncio.get_event_loop() # noqa # fmt: off package_found = asyncio.run( - get_package_from_pypi("pulp-file=={tag.name}", plugin_path) + get_package_from_pypi(f"pulp-file=={tag.name}", plugin_path) ) # noqa # fmt: on if not package_found: diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index 6083b3bc..61aa21f1 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -64,8 +64,9 @@ fi echo "machine pulp login admin password password -" | cmd_stdin_prefix bash -c "cat > /root/.netrc" -cmd_stdin_prefix bash -c "chmod og-rw /root/.netrc" +" | cmd_user_stdin_prefix bash -c "cat >> ~pulp/.netrc" +# Some commands like ansible-galaxy specifically require 600 +cmd_user_stdin_prefix bash -c "chmod 600 ~pulp/.netrc" cat unittest_requirements.txt | cmd_stdin_prefix bash -c "cat > /tmp/unittest_requirements.txt" cat functest_requirements.txt | cmd_stdin_prefix bash -c "cat > /tmp/functest_requirements.txt" @@ -90,17 +91,17 @@ cmd_prefix bash -c "cat /etc/pulp/certs/pulp_webserver.crt | tee -a "$CERTIFI" # check for any uncommitted migrations echo "Checking for uncommitted migrations..." -cmd_prefix bash -c "django-admin makemigrations --check --dry-run" +cmd_user_prefix bash -c "django-admin makemigrations --check --dry-run" # Run unit tests. -cmd_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes -p no:pulpcore --pyargs pulp_file.tests.unit" +cmd_user_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes -p no:pulpcore --pyargs pulp_file.tests.unit" # Run functional tests if [[ "$TEST" == "performance" ]]; then if [[ -z ${PERFORMANCE_TEST+x} ]]; then - cmd_prefix bash -c "pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulp_file.tests.performance" + cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulp_file.tests.performance" else - cmd_prefix bash -c "pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulp_file.tests.performance.test_$PERFORMANCE_TEST" + cmd_user_prefix bash -c "pytest -vv -r sx --color=yes --pyargs --capture=no --durations=0 pulp_file.tests.performance.test_$PERFORMANCE_TEST" fi exit fi @@ -110,20 +111,20 @@ if [ -f $FUNC_TEST_SCRIPT ]; then else if [[ "$GITHUB_WORKFLOW" == "File Nightly CI/CD" ]] || [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then - cmd_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_file.tests.functional -m parallel -n 8 --nightly" - cmd_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_file.tests.functional -m 'not parallel' --nightly" + cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_file.tests.functional -m parallel -n 8 --nightly" + cmd_user_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_file.tests.functional -m 'not parallel' --nightly" - cmd_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and parallel' -n 8 --nightly" - cmd_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and not parallel' --nightly" + cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and parallel' -n 8 --nightly" + cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and not parallel' --nightly" else - cmd_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_file.tests.functional -m parallel -n 8" - cmd_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_file.tests.functional -m 'not parallel'" + cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulp_file.tests.functional -m parallel -n 8" + cmd_user_prefix bash -c "pytest -v -r sx --color=yes --pyargs pulp_file.tests.functional -m 'not parallel'" - cmd_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and parallel' -n 8" - cmd_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and not parallel'" + cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and parallel' -n 8" + cmd_user_prefix bash -c "pytest -v -r sx --color=yes --suppress-no-test-exit-code --pyargs pulpcore.tests.functional -m 'from_pulpcore_for_all_plugins and not parallel'" fi diff --git a/.github/workflows/scripts/utils.sh b/.github/workflows/scripts/utils.sh index e3688bd0..fa5ebc50 100755 --- a/.github/workflows/scripts/utils.sh +++ b/.github/workflows/scripts/utils.sh @@ -14,7 +14,17 @@ cmd_prefix() { docker exec "$PULP_CI_CONTAINER" "$@" } +# Run a command as the limited pulp user +cmd_user_prefix() { + docker exec -u pulp "$PULP_CI_CONTAINER" "$@" +} + # Run a command, and pass STDIN cmd_stdin_prefix() { docker exec -i "$PULP_CI_CONTAINER" "$@" } + +# Run a command as the lmited pulp user, and pass STDIN +cmd_user_stdin_prefix() { + docker exec -i -u pulp "$PULP_CI_CONTAINER" "$@" +} diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 3f80e545..189e3bca 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -52,7 +52,7 @@ jobs: - name: Set short_ref id: vars - run: echo ::set-output name=short_ref::${GITHUB_REF#refs/*/} + run: echo short_ref=${GITHUB_REF#refs/*/} >> $GITHUB_OUTPUT - name: Run update run: | diff --git a/lint_requirements.txt b/lint_requirements.txt index 2ed62278..5abbb7a9 100644 --- a/lint_requirements.txt +++ b/lint_requirements.txt @@ -1,3 +1,10 @@ +# WARNING: DO NOT EDIT! +# +# This file was generated by plugin_template, and is managed by it. Please use +# './plugin-template --github pulp_file' to update this file. +# +# For more info visit https://github.com/pulp/plugin_template + # python packages handy for developers, but not required by pulp black check-manifest diff --git a/template_config.yml b/template_config.yml index 5cca8c86..332231c4 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-174-g56e0727 +# generated with plugin_template@2021.08.26-197-g21230dd additional_repos: - branch: main @@ -64,6 +64,7 @@ pulp_settings: - /tmp orphan_protection_time: 0 pulp_settings_azure: null +pulp_settings_gcp: null pulp_settings_s3: hide_guarded_distributions: true pulp_settings_stream: null @@ -90,6 +91,8 @@ test_bindings: false test_cli: true test_deprecations: true test_fips_nightly: false +test_gcp: false +test_lowerbounds: true test_performance: true test_released_plugin_with_next_pulpcore_release: true test_reroute: true