fix: Do not manage python-gnupg, support RedHat by default

2024-01-20 18:39:23 +01:00
parent e322c077b0
commit bc546e64f7
34 changed files with 4 additions and 37 deletions
--- a/.cruft.json
+++ b/.cruft.json
@@ -38,8 +38,7 @@
        },
        "requirements": [
          "git",
-          "gpg",
-          "python-gnupg"
+          "gpg"
        ],
        "build_user": "giteabuild",
        "build_user_home": "/home/giteabuild",
--- a/gitea/parameters/defaults.yaml
+++ b/gitea/parameters/defaults.yaml
@@ -45,7 +45,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/gitea/parameters/os_family/Debian.yaml
+++ b/gitea/parameters/os_family/Debian.yaml
@@ -13,8 +13,4 @@
 values:
  lookup:
    pkg_manager: apt
-    requirements:
-      - git
-      - gpg
-      - python3-gnupg
 ...
--- a/gitea/parameters/os_family/RedHat.yaml
+++ b/gitea/parameters/os_family/RedHat.yaml
@@ -13,4 +13,7 @@
 values:
  lookup:
    pkg_manager: yum
+    requirements:
+      - gnupg2
+      - git
 ...
--- a/pillar.example
+++ b/pillar.example
@@ -110,7 +110,6 @@ gitea:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git

--- a/test/integration/default/files/_mapdata/almalinux-8.yaml
+++ b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/arch-base-latest.yaml
+++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/centos-6.yaml
+++ b/test/integration/default/files/_mapdata/centos-6.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/debian-11.yaml
+++ b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/fedora-33.yaml
+++ b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/fedora-34.yaml
+++ b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/fedora-35.yaml
+++ b/test/integration/default/files/_mapdata/fedora-35.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/fedora-36.yaml
+++ b/test/integration/default/files/_mapdata/fedora-36.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/rockylinux-8.yaml
+++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/integration/default/files/_mapdata/ubuntu-22.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-22.yaml
@@ -48,7 +48,6 @@ values:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/salt/pillar/default.sls
+++ b/test/salt/pillar/default.sls
@@ -46,7 +46,6 @@ gitea:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config:
--- a/test/salt/pillar/upstart.sls
+++ b/test/salt/pillar/upstart.sls
@@ -46,7 +46,6 @@ gitea:
    requirements:
      - git
      - gpg
-      - python-gnupg
    shell: /bin/bash
    user: git
  config: