Update CI files for branch main

.ci/scripts/collect_changes.py

@@ -1,3 +1,4 @@
+#!/bin/env python3
 # WARNING: DO NOT EDIT!
 #
 # This file was generated by plugin_template, and is managed by it. Please use
@@ -8,13 +9,14 @@
 import itertools
 import os
 import re
+import tomllib
 
-import toml
 from git import GitCommandError, Repo
 from packaging.version import parse as parse_version
 
 # Read Towncrier settings
-tc_settings = toml.load("pyproject.toml")["tool"]["towncrier"]
+with open("pyproject.toml", "rb") as fp:
+    tc_settings = tomllib.load(fp)["tool"]["towncrier"]
 
 CHANGELOG_FILE = tc_settings.get("filename", "NEWS.rst")
 START_STRING = tc_settings.get(
@@ -79,7 +81,7 @@ def main():
     old_length = len(main_changes)
 
     for branch in branches:
-        print(f"Looking at branch {branch}")
+        print(f"Looking for './{CHANGELOG_FILE}' at branch {branch}")
         try:
             changelog = get_changelog(repo, branch)
         except GitCommandError:

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-328-g59a6718
+2021.08.26-338-g2237db8

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 1
           path: "pulp_ostree"
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
       - name: "Install python dependencies"
@@ -36,9 +36,10 @@ jobs:
           python3 setup.py sdist bdist_wheel --python-tag py3
           twine check dist/*
       - name: "Upload Package whl"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: "plugin_package"
           path: "pulp_ostree/dist/"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true

.github/workflows/changelog.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           fetch-depth: 1
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           fetch-depth: 0
           path: "pulp_ostree"
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
       - name: "Install python dependencies"
@@ -67,10 +67,11 @@ jobs:
           mkdir -p "pulp_ostree"
         working-directory: "."
       - name: "Download Deprecations"
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: "deprecations"
+          pattern: "deprecations-*"
           path: "pulp_ostree"
+          merge-multiple: true
       - name: "Print deprecations"
         run: |
           cat deprecations-*.txt | sort -u

.github/workflows/create-branch.yml

@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 0
           path: "pulp_ostree"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 

.github/workflows/lint.yml

@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 1
           path: "pulp_ostree"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 

.github/workflows/nightly.yml

@@ -38,7 +38,7 @@ jobs:
           fetch-depth: 0
           path: "pulp_ostree"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -76,12 +76,12 @@ jobs:
           fetch-depth: 1
           path: "pulp_ostree"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: "plugin_package"
           path: "pulp_ostree/dist/"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -96,13 +96,13 @@ jobs:
           echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV
 
       - name: Download built docs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: "docs.tar"
           path: "pulp_ostree"
 
       - name: Download Python client docs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: "python-client-docs.tar"
           path: "pulp_ostree"

.github/workflows/publish.yml

@@ -39,11 +39,11 @@ jobs:
           repository: "pulp/pulp-openapi-generator"
           path: "pulp-openapi-generator"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
-      - uses: "actions/download-artifact@v3"
+      - uses: "actions/download-artifact@v4"
         with:
           name: "plugin_package"
           path: "pulp_ostree/dist/"
@@ -88,25 +88,32 @@ jobs:
         run: |
           .github/workflows/scripts/install_ruby_client.sh
         shell: "bash"
+
       - name: "Upload python client packages"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: "python-client.tar"
-          path: "pulp_ostree/ostree-python-client.tar"
+          path: |
+            pulp_ostree/ostree-python-client.tar
           if-no-files-found: "error"
+          overwrite: true
 
       - name: "Upload python client docs"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: "python-client-docs.tar"
-          path: "pulp_ostree/ostree-python-client-docs.tar"
+          path: |
+            pulp_ostree/ostree-python-client-docs.tar
           if-no-files-found: "error"
+          overwrite: true
       - name: "Upload ruby client packages"
-        uses: "actions/upload-artifact@v3"
+        uses: "actions/upload-artifact@v4"
         with:
           name: "ruby-client.tar"
-          path: "pulp_ostree/ostree-ruby-client.tar"
+          path: |
+            pulp_ostree/ostree-ruby-client.tar
           if-no-files-found: "error"
+          overwrite: true
       - name: Build docs
         run: |
           export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
@@ -115,10 +122,12 @@ jobs:
           tar -cvf docs/docs.tar docs/_build
 
       - name: "Upload built docs"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "docs.tar"
           path: "pulp_ostree/docs/docs.tar"
+          if-no-files-found: "error"
+          overwrite: true
 
       - name: "Logs"
         if: always()
@@ -145,12 +154,12 @@ jobs:
           fetch-depth: 1
           path: "pulp_ostree"
 
-      - uses: "actions/download-artifact@v3"
+      - uses: "actions/download-artifact@v4"
         with:
           name: "plugin_package"
           path: "pulp_ostree/dist/"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -184,7 +193,7 @@ jobs:
           path: "pulp_ostree"
 
       - name: "Download Python client"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           name: "python-client.tar"
           path: "pulp_ostree/"
@@ -193,7 +202,7 @@ jobs:
         run: |
           tar -xvf ostree-python-client.tar
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -227,7 +236,7 @@ jobs:
           path: "pulp_ostree"
 
       - name: "Download Ruby client"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           name: "ruby-client.tar"
           path: "pulp_ostree/"
@@ -263,7 +272,7 @@ jobs:
           fetch-depth: 1
           path: "pulp_ostree"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
@@ -280,13 +289,13 @@ jobs:
           SECRETS_CONTEXT: "${{ toJson(secrets) }}"
 
       - name: "Download built docs"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           name: "docs.tar"
           path: "pulp_ostree/"
 
       - name: "Download Python client docs"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4"
         with:
           name: "python-client-docs.tar"
           path: "pulp_ostree/"

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
           path: "pulp_ostree"
           token: ${{ secrets.RELEASE_TOKEN }}
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 

.github/workflows/scripts/before_script.sh

@@ -36,12 +36,6 @@ tail -v -n +1 .ci/ansible/Containerfile
 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" "generate-bindings" "lowerbounds")
-if [[ " ${SCENARIOS[*]} " =~ " ${TEST} " ]]; then
-  # Many functional tests require these
-  cmd_prefix dnf install -yq lsof which
-fi
-
 if [[ "${REDIS_DISABLED:-false}" == true ]]; then
   cmd_prefix bash -c "s6-rc -d change redis"
   echo "The Redis service was disabled for $TEST"

.github/workflows/scripts/publish_client_pypi.sh

@@ -24,10 +24,8 @@ RESPONSE="$(curl --write-out '%{http_code}' --silent --output /dev/null "https:/
 if [ "$RESPONSE" == "200" ];
 then
   echo "pulp_ostree client $VERSION has already been released. Skipping."
-  exit
+else
+  twine upload -u __token__ -p "$PYPI_API_TOKEN" \
+  "dist/pulp_ostree_client-$VERSION-py3-none-any.whl" \
+  "dist/pulp_ostree-client-$VERSION.tar.gz"
 fi
-
-twine upload -u __token__ -p "$PYPI_API_TOKEN" \
-"dist/pulp_ostree_client-$VERSION-py3-none-any.whl" \
-"dist/pulp_ostree-client-$VERSION.tar.gz" \
-;

.github/workflows/test.yml

@@ -39,11 +39,11 @@ jobs:
           repository: "pulp/pulp-openapi-generator"
           path: "pulp-openapi-generator"
 
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
 
-      - uses: "actions/download-artifact@v3"
+      - uses: "actions/download-artifact@v4"
         with:
           name: "plugin_package"
           path: "pulp_ostree/dist/"
@@ -119,43 +119,50 @@ jobs:
           docker logs pulp 2>&1 | grep -i pulpcore.deprecation | tee deprecations-${{ matrix.env.TEST }}.txt
 
       - name: "Upload Deprecations"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: "deprecations"
+          name: "deprecations-${{ matrix.env.TEST }}"
           path: "pulp_ostree/deprecations-${{ matrix.env.TEST }}.txt"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true
       - name: Upload python client packages
         if: ${{ env.TEST == 'pulp' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "python-client.tar"
           path: "pulp_ostree/ostree-python-client.tar"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true
 
       - name: Upload python client docs
         if: ${{ env.TEST == 'pulp' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "python-client-docs.tar"
           path: "pulp_ostree/ostree-python-client-docs.tar"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true
       - name: Upload Ruby client
         if: ${{ env.TEST == 'pulp' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "ruby-client.tar"
           path: "pulp_ostree/ostree-ruby-client.tar"
           if-no-files-found: "error"
           retention-days: 5
+          overwrite: true
       - name: Upload built docs
         if: ${{ env.TEST == 'docs' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "docs.tar"
           path: "pulp_ostree/docs/docs.tar"
+          if-no-files-found: "error"
+          retention-days: 5
+          overwrite: true
 
       - name: "Logs"
         if: always()

.github/workflows/update-labels.yml

@@ -19,7 +19,7 @@ jobs:
   update_backport_labels:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/setup-python@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
       - name: "Configure Git with pulpbot name and email"