From 7fa1bbe0b082e55c3f437af0cf73afe7e163ba7e Mon Sep 17 00:00:00 2001
From: pulpbot <pulp-infra@redhat.com>
Date: Sun, 10 Mar 2024 02:33:51 +0000
Subject: [PATCH] Update CI files

[noissue]
---
 .ci/ansible/start_container.yaml     | 24 ++++++++----------------
 .github/template_gitref              |  2 +-
 .github/workflows/scripts/install.sh |  3 +--
 .github/workflows/scripts/script.sh  |  1 -
 template_config.yml                  |  3 +--
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/.ci/ansible/start_container.yaml b/.ci/ansible/start_container.yaml
index b19a2054..47e5221e 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 6461befc..0b278b20 100644
--- a/.github/template_gitref
+++ b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-317-gde9891b
+2021.08.26-319-ga283c28
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index cae596c9..5f838d27 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-certguard/dist/pulp_certguard-${PLUGIN_VERSION}-py3-none-any.whl"
+PLUGIN_SOURCE="./pulp-certguard/dist/pulp_certguard-${PLUGIN_VERSION}-py3-none-any.whl"
 
 export PULP_API_ROOT="/pulp/"
 
@@ -31,7 +31,6 @@ pip install ${PIP_REQUIREMENTS[*]}
 
 
 cd .ci/ansible/
-PLUGIN_SOURCE="${PLUGIN_NAME}"
 if [ "$TEST" = "s3" ]; then
   PLUGIN_SOURCE="${PLUGIN_SOURCE} pulpcore[s3]"
 fi
diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh
index f1c2dc4c..be25117a 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 certguard --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_certguard.tests.unit"
-
 # Run functional tests
 if [[ "$TEST" == "performance" ]]; then
   if [[ -z ${PERFORMANCE_TEST+x} ]]; then
diff --git a/template_config.yml b/template_config.yml
index 820b74dc..ce38113f 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-319-ga283c28
 
 api_root: /pulp/
 black: true
@@ -55,7 +55,6 @@ pulp_settings_gcp: null
 pulp_settings_s3:
   domain_enabled: true
   hide_guarded_distributions: true
-pulpprojectdotorg_key_id: null
 pydocstyle: true
 release_email: pulp-infra@redhat.com
 release_user: pulpbot