Use latest Fedora image and use RSA key type and curve for gpg key

Signed-off-by: Shreenidhi Shedi <[email protected]>
vmware · Dec 2, 2024 · 777516b · 777516b
1 parent 178a4fa
commit 777516b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/ci/Dockerfile.fedora b/ci/Dockerfile.fedora
@@ -1,4 +1,4 @@
-FROM fedora:34
+FROM fedora:latest
 
 COPY ci/prep.sh /prep.sh
 RUN chmod +x /prep.sh

diff --git a/ci/prep.sh b/ci/prep.sh
@@ -18,6 +18,7 @@ common_pkgs=(
   python3-pip
   python3-pyOpenSSL
   python3-requests
+  python3-setuptools
   python3-urllib3
   rpm-build
   sed

diff --git a/pytests/repo/setup-repo.sh b/pytests/repo/setup-repo.sh
@@ -63,16 +63,16 @@ mkdir -p -m 755 ${BUILD_PATH}/BUILD \
 
 #gpgkey data for unattended key generation
 cat << EOF > ${TEST_REPO_DIR}/gpgkeydata
-     %echo Generating a key for repogpgcheck signatures
-     %no-protection
-     Key-Type: default
-     Subkey-Type: default
-     Name-Real: tdnf test
-     Name-Comment: tdnf test key
-     Name-Email: [email protected]
-     Expire-Date: 0
-     %commit
-     %echo done
+%echo Generating a key for repogpgcheck signatures
+%no-protection
+Key-Type: RSA
+Subkey-Type: RSA
+Name-Real: tdnf test
+Name-Comment: tdnf test key
+Name-Email: [email protected]
+Expire-Date: 0
+%commit
+%echo done
 EOF
 
 #generate a key non interactively. this is used in testing