Add fedora33 support

Remove fedora31 and add support for fedora33

re: #7800
https://pulp.plan.io/issues/7800

.github/vars/main.yaml

@@ -6,8 +6,8 @@ molecule_images:
   - name: centos-8
     image: centos:8
     command: /sbin/init
-  - name: fedora-31
-    image: fedora:31
+  - name: fedora-33
+    image: fedora:33
     command: /usr/sbin/init
   - name: debian-10
     image: debian:10

CHANGES/7800.feature

@@ -0,0 +1 @@
+Add support for Fedora 33.

molecule/release-dynamic/molecule.yml

@@ -38,8 +38,8 @@ platforms:
     image: pulp/molecule_debian10
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: pulp/molecule_fedora31
+    name: fedora-33
+    image: pulp/molecule_fedora33
     command: /usr/sbin/init
 provisioner:
   name: ansible

molecule/release-static/molecule.yml

@@ -38,8 +38,8 @@ platforms:
     image: pulp/molecule_debian10
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: pulp/molecule_fedora31
+    name: fedora-33
+    image: pulp/molecule_fedora33
     command: /usr/sbin/init
 provisioner:
   name: ansible

molecule/release-upgrade/molecule.yml

@@ -35,8 +35,8 @@ platforms:
     image: quay.io/pulp/pulp-ci-dbuster:3.0.0
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: quay.io/pulp/pulp_rpm-ci-f31:3.1.0
+    name: fedora-33
+    image: quay.io/pulp/pulp_rpm-ci-f33:3.9.0
     command: /usr/sbin/init
 provisioner:
   name: ansible

molecule/source-dynamic/molecule.yml

@@ -38,8 +38,8 @@ platforms:
     image: pulp/molecule_debian10
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: pulp/molecule_fedora31
+    name: fedora-33
+    image: pulp/molecule_fedora33
     command: /usr/sbin/init
 provisioner:
   name: ansible

molecule/source-static/molecule.yml

@@ -38,8 +38,8 @@ platforms:
     image: pulp/molecule_debian10
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: pulp/molecule_fedora31
+    name: fedora-33
+    image: pulp/molecule_fedora33
     command: /usr/sbin/init
 provisioner:
   name: ansible

molecule/source-upgrade/molecule.yml

@@ -31,8 +31,8 @@ platforms:
     image: quay.io/pulp/pulp-ci-dbuster:3.0.0
     command: /sbin/init
   - <<: *platform_base
-    name: fedora-31
-    image: quay.io/pulp/pulp_rpm-ci-f31:3.1.0
+    name: fedora-33
+    image: quay.io/pulp/pulp_rpm-ci-f33:3.9.0
     command: /usr/sbin/init
 provisioner:
   name: ansible

roles/pulp_all_services/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_api/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_common/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_content/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_database/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_database/vars/Fedora-33.yml

@@ -0,0 +1,16 @@
+---
+# Fedora 33 containers only have python3 by default
+postgresql_python_library: python3-psycopg2
+
+# Geerlingguy.postgresql roles doesn't support F33
+__postgresql_version: "12.4"
+__postgresql_data_dir: "/var/lib/pgsql/data"
+__postgresql_bin_path: "/usr/bin"
+__postgresql_config_path: "/var/lib/pgsql/data"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-server
+  - postgresql-contrib
+  - postgresql-libs
+__postgresql_unix_socket_directories_mode: '0755'

roles/pulp_database_config/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_devel/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_health_check/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_redis/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_redis/vars/Fedora-33.yml

@@ -0,0 +1,3 @@
+---
+_pulp_redis_server_name: redis
+_pulp_redis_conf_file: '/etc/redis/redis.conf'

roles/pulp_resource_manager/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_rpm_prerequisites/meta/main.yml

@@ -15,8 +15,8 @@ galaxy_info:
   platforms:
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_services/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_webserver/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

roles/pulp_workers/meta/main.yml

@@ -12,8 +12,8 @@ galaxy_info:
         - buster
     - name: Fedora
       versions:
-        - 30
-        - 31
+        - 32
+        - 33
     - name: EL
       versions:
         - 7

vagrant/boxes.d/00-fedora.yaml

@@ -1,14 +1,14 @@
-fedora31:
-  box_name: 'fedora/31-cloud-base'
-  image_name: !ruby/regexp '/Fedora 31.*/'
+fedora32:
+  box_name: 'fedora/32-cloud-base'
+  image_name: !ruby/regexp '/Fedora 32.*/'
   pty: true
   ansible:
     variables:
       ansible_python_interpreter: /usr/bin/python3
 
-fedora32:
-  box_name: 'fedora/32-cloud-base'
-  image_name: !ruby/regexp '/Fedora 32.*/'
+fedora33:
+  box_name: 'fedora/33-cloud-base'
+  image_name: !ruby/regexp '/Fedora 33.*/'
   pty: true
   ansible:
     variables:

vagrant/boxes.d/20-sandbox.yaml

@@ -1,12 +1,12 @@
-pulp3-sandbox-fedora31:
-  box: 'fedora31'
+pulp3-sandbox-fedora32:
+  box: 'fedora32'
   memory: 4096
   ansible:
     playbook: "vagrant/playbooks/user-sandbox.yml"
     galaxy_role_file: "requirements.yml"
 
-pulp3-sandbox-fedora32:
-  box: 'fedora32'
+pulp3-sandbox-fedora33:
+  box: 'fedora33'
   memory: 4096
   ansible:
     playbook: "vagrant/playbooks/user-sandbox.yml"

vagrant/boxes.d/30-source.yaml

@@ -1,5 +1,5 @@
-pulp3-source-fedora31:
-  box: 'fedora31'
+pulp3-source-fedora32:
+  box: 'fedora32'
   sshfs:
     host_path: '..'
     guest_path: '/home/vagrant/devel'
@@ -9,8 +9,8 @@ pulp3-source-fedora31:
     playbook: "vagrant/playbooks/source-install.yml"
     galaxy_role_file: "requirements.yml"
 
-pulp3-source-fedora32:
-  box: 'fedora32'
+pulp3-source-fedora33:
+  box: 'fedora33'
   sshfs:
     host_path: '..'
     guest_path: '/home/vagrant/devel'