Merge topic 'ci-fedora33'

213d8818 ci: add libxkbcommon to the CI image
41acdc3a gitlab-ci: use Fedora 33 images
5e079b91 ci: update to Fedora 33 for Linux testing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !797

.gitlab-ci.yml

@@ -47,7 +47,7 @@ build:linux-plain:
 
 test:linux-plain:
     extends:
-        - .fedora31_plain
+        - .fedora33_plain
         - .cmake_test_linux
         - .cmake_package_artifacts
         - .linux_test_tags
@@ -81,7 +81,7 @@ build:linux-egl:
 test:linux-egl:
     extends:
         # Required to get EGL support in the container.
-        - .fedora31_egl
+        - .fedora33_egl
         - .cmake_test_linux
         - .cmake_package_artifacts
         - .linux_test_tags

.gitlab/ci/docker/fedora31/Dockerfile → .gitlab/ci/docker/fedora33/Dockerfile

-FROM fedora:31
+FROM fedora:33
 MAINTAINER Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
 
-RUN dnf install -y \
+RUN dnf install --setopt=install_weak_deps=False -y \
   /usr/bin/glxinfo git mesa-dri-drivers mesa-libGL* \
-  libXcursor-devel libxcrypt-compat.x86_64 \
+  libXcursor-devel libxcrypt-compat.x86_64 libxkbcommon \
   && dnf clean all

.gitlab/os-linux.yml

@@ -40,21 +40,21 @@
     variables:
         CMAKE_CONFIGURATION: linux_osmesa_static
 
-.fedora31:
-    image: "kitware/paraview:ci-superbuild-fedora31-20201027"
+.fedora33:
+    image: "kitware/paraview:ci-superbuild-fedora33-20201112"
 
     variables:
         GIT_SUBMODULE_STRATEGY: none
         GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci
 
-.fedora31_plain:
-    extends: .fedora31
+.fedora33_plain:
+    extends: .fedora33
 
     variables:
         CMAKE_CONFIGURATION: linux_plain
 
-.fedora31_egl:
-    extends: .fedora31
+.fedora33_egl:
+    extends: .fedora33
 
     variables:
         CMAKE_CONFIGURATION: linux_egl