Fix 3.21 CI

.github/workflows/pr_build_images.yaml

@@ -12,15 +12,13 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # by default, it uses a depth of 1
           # this fetches all history so that we can read each commit
           fetch-depth: 0
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
-        with:
-          python-version: '3.8'
+      - uses: actions/setup-python@v4
+
       - name: Check commit message
         if: github.event_name == 'pull_request'
         env:

.github/workflows/publish_images.yaml

@@ -18,7 +18,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Download s6-overlay
         run: |
           wget https://github.com/just-containers/s6-overlay/releases/download/v3.1.2.1/s6-overlay-x86_64.tar.xz
@@ -33,9 +33,7 @@ jobs:
           echo "Building and publishing $version."
           echo "VERSION=$version" >> $GITHUB_ENV
 
-      - uses: actions/setup-python@v3
-        with:
-          python-version: "3.8"
+      - uses: actions/setup-python@v4
 
       - name: Install python dependencies
         if: github.event_name == 'schedule'

.github/workflows/pulp_images.yml

@@ -22,15 +22,14 @@ jobs:
           - image_tag: latest
           - image_tag: stable
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # by default, it uses a depth of 1
           # this fetches all history so that we can read each commit
           fetch-depth: 0
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
-        with:
-          python-version: '3.8'
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v4
+
       - name: Install httpie and podman-compose
         run: |
           echo ::group::HTTPIE

s6_images/assets/test.sh

@@ -56,20 +56,20 @@ if [[ ${image} != *"galaxy"* ]];then
   fi
   echo "Setup the signing services"
   # Setup key on the Pulp container
-  curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-KEY-pulp-qe |docker exec -i pulp bash -c "cat > /tmp/GPG-KEY-pulp-qe"
-  curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-PRIVATE-KEY-pulp-qe |docker exec -i pulp gpg --import
-  echo "6EDF301256480B9B801EBA3D05A5E6DA269D9D98:6:" |docker exec -i pulp gpg --import-ownertrust
+  curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-KEY-fixture-signing |docker exec -i pulp bash -c "cat > /tmp/GPG-KEY-fixture-signing"
+  curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-PRIVATE-KEY-fixture-signing |docker exec -i pulp gpg --import
+  echo "0C1A894EBB86AFAE218424CADDEF3019C2D4A8CF:6:" |docker exec -i pulp gpg --import-ownertrust
   # Setup key on the test machine
-  curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-KEY-pulp-qe | cat > /tmp/GPG-KEY-pulp-qe
-  curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-PRIVATE-KEY-pulp-qe | gpg --import
-  echo "6EDF301256480B9B801EBA3D05A5E6DA269D9D98:6:" | gpg --import-ownertrust
+  curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-KEY-fixture-signing | cat > /tmp/GPG-KEY-pulp-qe
+  curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-PRIVATE-KEY-fixture-signing | gpg --import
+  echo "0C1A894EBB86AFAE218424CADDEF3019C2D4A8CF:6:" | gpg --import-ownertrust
   echo "Setup ansible signing service"
   docker exec -i pulp bash -c "cat > /root/sign_detached.sh" < "${PWD}/tests/assets/sign_detached.sh"
   docker exec pulp chmod a+x /root/sign_detached.sh
-  docker exec pulp bash -c "pulpcore-manager add-signing-service --class core:AsciiArmoredDetachedSigningService sign_ansible /root/sign_detached.sh 'Pulp QE'"
+  docker exec pulp bash -c "pulpcore-manager add-signing-service --class core:AsciiArmoredDetachedSigningService sign_ansible /root/sign_detached.sh 'pulp-fixture-signing-key'"
   echo "Setup deb release signing service"
   docker exec -i pulp bash -c "cat > /root/sign_deb_release.sh" < "${PWD}/tests/assets/sign_deb_release.sh"
   docker exec pulp chmod a+x /root/sign_deb_release.sh
-  docker exec pulp bash -c "pulpcore-manager add-signing-service --class deb:AptReleaseSigningService sign_deb_release /root/sign_deb_release.sh 'Pulp QE'"
+  docker exec pulp bash -c "pulpcore-manager add-signing-service --class deb:AptReleaseSigningService sign_deb_release /root/sign_deb_release.sh 'pulp-fixture-signing-key'"
   make test
 fi