Update CI files

[noissue]

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-154-g7bcbd1f
+2021.08.26-156-gb5f4d20

.github/workflows/ci.yml

@@ -208,7 +208,7 @@ jobs:
           docker logs pulp || true
           docker exec pulp ls -latr /etc/yum.repos.d/ || true
           docker exec pulp cat /etc/yum.repos.d/* || true
-          docker exec pulp pip3 list
+          docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
   deprecations:
     runs-on: ubuntu-latest
     if: always()

.github/workflows/nightly.yml

@@ -166,7 +166,7 @@ jobs:
           docker logs pulp || true
           docker exec pulp ls -latr /etc/yum.repos.d/ || true
           docker exec pulp cat /etc/yum.repos.d/* || true
-          docker exec pulp pip3 list
+          docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
 
   changelog:
     runs-on: ubuntu-latest
@@ -363,4 +363,4 @@ jobs:
           docker logs pulp || true
           docker exec pulp ls -latr /etc/yum.repos.d/ || true
           docker exec pulp cat /etc/yum.repos.d/* || true
-          docker exec pulp pip3 list
+          docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"

.github/workflows/release.yml

@@ -240,7 +240,7 @@ jobs:
           docker logs pulp || true
           docker exec pulp ls -latr /etc/yum.repos.d/ || true
           docker exec pulp cat /etc/yum.repos.d/* || true
-          docker exec pulp pip3 list
+          docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
 
 
   publish:

.github/workflows/scripts/before_install.sh

@@ -30,17 +30,6 @@ fi
 COMMIT_MSG=$(git log --format=%B --no-merges -1)
 export COMMIT_MSG
 
-if [[ "$TEST" == "upgrade" ]]; then
-  pip install -r functest_requirements.txt
-  git checkout -b ci_upgrade_test
-  cp -R .github /tmp/.github
-  cp -R .ci /tmp/.ci
-  git checkout $FROM_PULP_ANSIBLE_BRANCH
-  rm -rf .ci .github
-  cp -R /tmp/.github .
-  cp -R /tmp/.ci .
-fi
-
 if [[ "$TEST" == "plugin-from-pypi" ]]; then
   COMPONENT_VERSION=$(http https://pypi.org/pypi/pulp-ansible/json | jq -r '.info.version')
 else

.github/workflows/scripts/before_script.sh

@@ -29,7 +29,7 @@ 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" "upgrade" "azure" "s3" "stream" "plugin-from-pypi" "generate-bindings")
+SCENARIOS=("pulp" "performance" "azure" "s3" "stream" "plugin-from-pypi" "generate-bindings")
 if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
   # Many functional tests require these
   cmd_prefix dnf install -yq lsof which dnf-plugins-core

.github/workflows/scripts/install.sh

@@ -90,10 +90,6 @@ pulp_scheme: https
 pulp_container_tag: https
 
 VARSYAML
-
-if [ "$TEST" = "upgrade" ]; then
-  sed -i "/^pulp_container_tag:.*/s//pulp_container_tag: upgrade-https/" vars/main.yaml
-fi
 if [ "$TEST" == 'stream' ]; then
   sed -i -e '/^services:/a \
   - name: ci-sftp\

.github/workflows/scripts/script.sh

@@ -89,10 +89,8 @@ cmd_prefix bash -c "cat /etc/pulp/certs/pulp_webserver.crt  | tee -a "$CERTIFI"
 echo "Checking for uncommitted migrations..."
 cmd_prefix bash -c "django-admin makemigrations --check --dry-run"
 
-if [[ "$TEST" != "upgrade" ]]; then
-  # Run unit tests.
-  cmd_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes -p no:pulpcore --pyargs pulp_ansible.tests.unit"
-fi
+# Run unit tests.
+cmd_prefix bash -c "PULP_DATABASES__default__USER=postgres pytest -v -r sx --color=yes -p no:pulpcore --pyargs pulp_ansible.tests.unit"
 
 # Run functional tests
 if [[ "$TEST" == "performance" ]]; then