From 49da685a7ba8455c29c6c472e56c0712c6758dac Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 12 Mar 2024 11:53:08 +0000 Subject: [PATCH] Update CI files [noissue] --- .ci/ansible/start_container.yaml | 24 ++++++++---------------- .github/template_gitref | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/create-branch.yml | 4 ++-- .github/workflows/kanban.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/scripts/install.sh | 5 ++--- .github/workflows/scripts/script.sh | 3 +-- .github/workflows/update-labels.yml | 2 +- .github/workflows/update_ci.yml | 14 +++++++------- docs/template_gitref | 2 +- template_config.yml | 3 +-- 12 files changed, 27 insertions(+), 38 deletions(-) diff --git a/.ci/ansible/start_container.yaml b/.ci/ansible/start_container.yaml index b19a2054f..47e5221e5 100644 --- a/.ci/ansible/start_container.yaml +++ b/.ci/ansible/start_container.yaml @@ -83,22 +83,14 @@ command: "docker logs pulp" failed_when: true - - block: - - name: "Check version of component being tested" - assert: - that: - - (result.json.versions | items2dict(key_name="component", value_name="version"))[component_name] | canonical_semver == (component_version | canonical_semver) - fail_msg: | - Component {{ component_name }} was expected to be installed in version {{ component_version }}. - Instead it is reported as version {{ (result.json.versions | items2dict(key_name="component", value_name="version"))[component_name] }}. - rescue: - - name: "Check version of component being tested (legacy)" - assert: - that: - - (result.json.versions | items2dict(key_name="component", value_name="version"))[legacy_component_name] | canonical_semver == (component_version | canonical_semver) - fail_msg: | - Component {{ legacy_component_name }} was expected to be installed in version {{ component_version }}. - Instead it is reported as version {{ (result.json.versions | items2dict(key_name="component", value_name="version"))[legacy_component_name] }}. + - name: "Check version of component being tested" + assert: + that: + - (result.json.versions | items2dict(key_name="component", value_name="version"))[item.app_label] | canonical_semver == (component_version | canonical_semver) + fail_msg: | + Component {{ item.app_label }} was expected to be installed in version {{ component_version }}. + Instead it is reported as version {{ (result.json.versions | items2dict(key_name="component", value_name="version"))[item.app_label] }}. + loop: "{{ 'plugins' | ansible.builtin.extract(lookup('ansible.builtin.file', '../../template_config.yml') | from_yaml) }}" - name: "Set pulp password in .netrc" copy: diff --git a/.github/template_gitref b/.github/template_gitref index e456a48e1..8b7135e44 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-316-g69ef1f6 +2021.08.26-320-g4fd782b diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0f2121f3a..761d0e2e7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index 227dd7420..692387948 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -72,7 +72,7 @@ jobs: find CHANGES -type f -regex ".*\.\(bugfix\|doc\|feature\|misc\|deprecation\|removal\)" -exec git rm {} + - name: Checkout plugin template - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: pulp/plugin_template path: plugin_template @@ -85,7 +85,7 @@ jobs: git add -A - name: Make a PR with version bump and without CHANGES/* - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v6 with: path: pulp_ansible token: ${{ secrets.RELEASE_TOKEN }} diff --git a/.github/workflows/kanban.yml b/.github/workflows/kanban.yml index 60b81c374..0670520ef 100644 --- a/.github/workflows/kanban.yml +++ b/.github/workflows/kanban.yml @@ -61,7 +61,7 @@ jobs: linked-issues: ${{ steps.linked-issues.outputs.issues }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Get Linked Issues Action uses: kin/gh-action-get-linked-issues@v1.0 id: linked-issues diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5cee56013..e1f124246 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -57,7 +57,7 @@ jobs: run: python .ci/scripts/collect_changes.py - name: Create Pull Request - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.RELEASE_TOKEN }} title: "Update Changelog" diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 0029543d7..c69aa37cd 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -16,7 +16,7 @@ set -euv source .github/workflows/scripts/utils.sh PLUGIN_VERSION="$(sed -n -e 's/^\s*current_version\s*=\s*//p' .bumpversion.cfg | python -c 'from packaging.version import Version; print(Version(input()))')" -PLUGIN_NAME="./pulp_ansible/dist/pulp_ansible-${PLUGIN_VERSION}-py3-none-any.whl" +PLUGIN_SOURCE="./pulp_ansible/dist/pulp_ansible-${PLUGIN_VERSION}-py3-none-any.whl" export PULP_API_ROOT="/pulp/" @@ -35,7 +35,6 @@ then fi cd .ci/ansible/ -PLUGIN_SOURCE="${PLUGIN_NAME}" if [ "$TEST" = "s3" ]; then PLUGIN_SOURCE="${PLUGIN_SOURCE} pulpcore[s3]" fi @@ -127,7 +126,7 @@ if [ "${PULP_API_ROOT:-}" ]; then sed -i -e '$a api_root: "'"$PULP_API_ROOT"'"' vars/main.yaml fi -pulp config create --base-url https://pulp --api-root "$PULP_API_ROOT" +pulp config create --base-url https://pulp --api-root "$PULP_API_ROOT" --username "admin" --password "password" if [[ "$TEST" != "docs" ]]; then cp ~/.config/pulp/cli.toml "${REPO_ROOT}/../pulp-cli/tests/cli.toml" fi diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index 45c94c0d9..009466348 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -130,7 +130,6 @@ cmd_user_prefix bash -c "django-admin makemigrations ansible --check --dry-run" # Run unit tests. cmd_user_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes --suppress-no-test-exit-code -p no:pulpcore --pyargs pulp_ansible.tests.unit" - # Run functional tests if [[ "$TEST" == "performance" ]]; then if [[ -z ${PERFORMANCE_TEST+x} ]]; then @@ -155,7 +154,7 @@ else fi pushd ../pulp-cli pip install -r test_requirements.txt -pytest -v -m pulp_ansible +pytest -v -m "pulp_ansible" popd if [ -f "$POST_SCRIPT" ]; then diff --git a/.github/workflows/update-labels.yml b/.github/workflows/update-labels.yml index 6839c707a..83560e27c 100644 --- a/.github/workflows/update-labels.yml +++ b/.github/workflows/update-labels.yml @@ -31,7 +31,7 @@ jobs: echo ::group::PYDEPS pip install requests pyyaml echo ::endgroup:: - - uses: "actions/checkout@v3" + - uses: "actions/checkout@v4" - name: "Update labels" run: | python3 .github/workflows/scripts/update_backport_labels.py diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 8f4978045..083f3281b 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -55,7 +55,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_ansible" @@ -82,7 +82,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_ansible" @@ -109,7 +109,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_ansible" @@ -136,7 +136,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_ansible" @@ -163,7 +163,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_ansible" @@ -190,7 +190,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_ansible" @@ -217,7 +217,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_ansible" diff --git a/docs/template_gitref b/docs/template_gitref index e456a48e1..8b7135e44 100644 --- a/docs/template_gitref +++ b/docs/template_gitref @@ -1 +1 @@ -2021.08.26-316-g69ef1f6 +2021.08.26-320-g4fd782b diff --git a/template_config.yml b/template_config.yml index 806443b40..568e05cba 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-316-g69ef1f6 +# generated with plugin_template@2021.08.26-320-g4fd782b api_root: /pulp/ black: true @@ -63,7 +63,6 @@ pulp_settings_gcp: pulp_settings_s3: ansible_collect_download_count: true ansible_collect_download_log: true -pulpprojectdotorg_key_id: aa499d7938ed pydocstyle: true release_email: pulp-infra@redhat.com release_user: pulpbot