From de0029073184282af29de39868eafa17f0f36763 Mon Sep 17 00:00:00 2001
From: Steven Koo <steven.koo@ni.com>
Date: Tue, 2 Nov 2021 11:46:08 -0500
Subject: ci: Remove Fedora 33 and add Fedora 35

Fedora 33 is going EOL and Fedora 35 was recently released

Signed-off-by: Steven Koo <steven.koo@ni.com>
---
 .ci/docker/uhd-builder-fedora33.Dockerfile | 59 ------------------------------
 .ci/docker/uhd-builder-fedora35.Dockerfile | 59 ++++++++++++++++++++++++++++++
 .ci/uhd-build-docker-container.yml         |  4 +-
 3 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 .ci/docker/uhd-builder-fedora33.Dockerfile
 create mode 100644 .ci/docker/uhd-builder-fedora35.Dockerfile

(limited to '.ci')

diff --git a/.ci/docker/uhd-builder-fedora33.Dockerfile b/.ci/docker/uhd-builder-fedora33.Dockerfile
deleted file mode 100644
index a7d5e1a74..000000000
--- a/.ci/docker/uhd-builder-fedora33.Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-# please follow docker best practices
-# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
-
-FROM fedora:33
-LABEL maintainer="Ettus Research"
-
-RUN dnf install -y \
-        boost-devel \
-        ccache \
-        clang \
-        cmake \
-        doxygen \
-        dpdk \
-        dpdk-devel \
-        dpdk-tools \
-        gcc \
-        gcc-c++ \
-        git \
-        libusb1-devel \
-        make \
-        ncompress \
-        ninja-build \
-        python3-devel \
-        python3-docutils \
-        python3-mako \
-        python3-numpy \
-        python3-pip \
-        python3-requests \
-        redhat-rpm-config \
-        rpm-build \
-        rpm-devel \
-        rsync \
-        tar \
-        xz \
-    # Install GNURadio dependencies
-        python3-sphinx \
-        python3-lxml \
-        SDL-devel \
-        gsl-devel \
-        qwt-qt5-devel \
-        qt5-qtbase-devel \
-        gmp-devel \
-        fftw-devel \
-        swig \
-        gtk3-devel \
-        pango-devel \
-        PyQt5 \
-        log4cpp-devel \
-        zeromq-devel \
-        cppzmq-devel \
-        python3-yaml \
-        python3-click \
-        python3-click-plugins \
-        python3-zmq \
-        python3-scipy \
-        python3-cairo-devel \
-        python3-gobject \
-        && \
-    dnf clean all
diff --git a/.ci/docker/uhd-builder-fedora35.Dockerfile b/.ci/docker/uhd-builder-fedora35.Dockerfile
new file mode 100644
index 000000000..bab37707c
--- /dev/null
+++ b/.ci/docker/uhd-builder-fedora35.Dockerfile
@@ -0,0 +1,59 @@
+# please follow docker best practices
+# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
+
+FROM fedora:35
+LABEL maintainer="Ettus Research"
+
+RUN dnf install -y \
+        boost-devel \
+        ccache \
+        clang \
+        cmake \
+        doxygen \
+        dpdk \
+        dpdk-devel \
+        dpdk-tools \
+        gcc \
+        gcc-c++ \
+        git \
+        libusb1-devel \
+        make \
+        ncompress \
+        ninja-build \
+        python3-devel \
+        python3-docutils \
+        python3-mako \
+        python3-numpy \
+        python3-pip \
+        python3-requests \
+        redhat-rpm-config \
+        rpm-build \
+        rpm-devel \
+        rsync \
+        tar \
+        xz \
+    # Install GNURadio dependencies
+        python3-sphinx \
+        python3-lxml \
+        SDL-devel \
+        gsl-devel \
+        qwt-qt5-devel \
+        qt5-qtbase-devel \
+        gmp-devel \
+        fftw-devel \
+        swig \
+        gtk3-devel \
+        pango-devel \
+        PyQt5 \
+        log4cpp-devel \
+        zeromq-devel \
+        cppzmq-devel \
+        python3-yaml \
+        python3-click \
+        python3-click-plugins \
+        python3-zmq \
+        python3-scipy \
+        python3-cairo-devel \
+        python3-gobject \
+        && \
+    dnf clean all
diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml
index 8ce982d30..1f0a65ef3 100644
--- a/.ci/uhd-build-docker-container.yml
+++ b/.ci/uhd-build-docker-container.yml
@@ -38,8 +38,8 @@ variables:
 - template: uhd-pipeline-vars.yml
 - name: linuxDockerImages
   value:
-    "{'Fedora-33-builder':{'buildOSName':'fedora33','dockerImageName':'uhd-builder-fedora33'},
-    'Fedora-34-builder':{'buildOSName':'fedora34','dockerImageName':'uhd-builder-fedora34'},
+    "{'Fedora-34-builder':{'buildOSName':'fedora34','dockerImageName':'uhd-builder-fedora34'},
+    'Fedora-35-builder':{'buildOSName':'fedora35','dockerImageName':'uhd-builder-fedora35'},
     'Ubuntu-1804-builder':{'buildOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804'},
     'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004'}}"
 - name: winDockerImages
-- 
cgit v1.2.3