From 3f93d77e1e7ea83e1f17b5ce448a19f211cb6e84 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Thu, 30 Nov 2023 14:19:49 -0500 Subject: [PATCH] Merge pull request #560 from dralley/old-signing-keys Use new test fixture signing key in CI image (cherry picked from commit 00f100953edc3dc8f50c08508f0441eeb9ce8101) --- .github/workflows/pulp_images.yml | 12 +++--------- images/s6_assets/pulp_tests.sh | 16 ++++++++-------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/pulp_images.yml b/.github/workflows/pulp_images.yml index 3e70d062..97b053bb 100644 --- a/.github/workflows/pulp_images.yml +++ b/.github/workflows/pulp_images.yml @@ -23,10 +23,8 @@ jobs: # this fetches all history so that we can read each commit fetch-depth: 0 - - name: Set up Python 3.8 + - name: Set up Python uses: actions/setup-python@v4 - with: - python-version: '3.8' - name: Check commit message if: github.event_name == 'pull_request' @@ -81,10 +79,8 @@ jobs: # this fetches all history so that we can read each commit fetch-depth: 0 - - name: Set up Python 3.8 + - name: Set up Python uses: actions/setup-python@v4 - with: - python-version: '3.8' - name: Update to the latest pip run: python -m pip install --upgrade pip @@ -168,10 +164,8 @@ jobs: # this fetches all history so that we can read each commit fetch-depth: 0 - - name: Set up Python 3.8 + - name: Set up Python uses: actions/setup-python@v4 - with: - python-version: '3.8' - name: Install python dependencies if: github.event_name == 'schedule' diff --git a/images/s6_assets/pulp_tests.sh b/images/s6_assets/pulp_tests.sh index e6d7bd73..fd8fb555 100755 --- a/images/s6_assets/pulp_tests.sh +++ b/images/s6_assets/pulp_tests.sh @@ -36,21 +36,21 @@ 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 | podman exec -i pulp su pulp -c "cat > /tmp/GPG-KEY-pulp-qe" -curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-PRIVATE-KEY-pulp-qe | podman exec -i pulp su pulp -c "gpg --import" -echo "6EDF301256480B9B801EBA3D05A5E6DA269D9D98:6:" | podman exec -i pulp gpg --import-ownertrust +curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-KEY-fixture-signing | podman exec -i pulp su pulp -c "cat > /tmp/GPG-KEY-fixture-signing" +curl -L https://github.com/pulp/pulp-fixtures/raw/master/common/GPG-PRIVATE-KEY-fixture-signing | podman exec -i pulp su pulp -c "gpg --import" +echo "0C1A894EBB86AFAE218424CADDEF3019C2D4A8CF:6:" | podman 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-fixture-signing +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" podman exec -u pulp -i pulp bash -c "cat > /var/lib/pulp/scripts/sign_detached.sh" < "${PWD}/tests/assets/sign_detached.sh" podman exec -u pulp pulp chmod a+rx /var/lib/pulp/scripts/sign_detached.sh -podman exec -u pulp pulp bash -c "pulpcore-manager add-signing-service --class core:AsciiArmoredDetachedSigningService sign_ansible /var/lib/pulp/scripts/sign_detached.sh 'Pulp QE'" +podman exec -u pulp pulp bash -c "pulpcore-manager add-signing-service --class core:AsciiArmoredDetachedSigningService sign_ansible /var/lib/pulp/scripts/sign_detached.sh 'pulp-fixture-signing-key'" echo "Setup deb release signing service" podman exec -u pulp -i pulp bash -c "cat > /var/lib/pulp/scripts/sign_deb_release.sh" < "${PWD}/tests/assets/sign_deb_release.sh" podman exec -u pulp pulp chmod a+rx /var/lib/pulp/scripts/sign_deb_release.sh -podman exec -u pulp pulp bash -c "pulpcore-manager add-signing-service --class deb:AptReleaseSigningService sign_deb_release /var/lib/pulp/scripts/sign_deb_release.sh 'Pulp QE'" +podman exec -u pulp pulp bash -c "pulpcore-manager add-signing-service --class deb:AptReleaseSigningService sign_deb_release /var/lib/pulp/scripts/sign_deb_release.sh 'pulp-fixture-signing-key'" echo "Run all CLI tests" make test \ No newline at end of file