From 3111b4a230ce7534912600fe045114fed5c8ed6d Mon Sep 17 00:00:00 2001
From: Steven Koo <steven.koo@ni.com>
Date: Sun, 22 Aug 2021 22:50:30 -0500
Subject: ci: Add Fedora 34 and remove Fedora 32

Fedora 34 has been released and Fedora 32 is EOL

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

(limited to '.ci')

diff --git a/.ci/docker/uhd-builder-fedora32.Dockerfile b/.ci/docker/uhd-builder-fedora32.Dockerfile
deleted file mode 100644
index e495364c9..000000000
--- a/.ci/docker/uhd-builder-fedora32.Dockerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-# please follow docker best practices
-# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
-
-FROM fedora:32
-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 \
-        && \
-    dnf clean all
diff --git a/.ci/docker/uhd-builder-fedora34.Dockerfile b/.ci/docker/uhd-builder-fedora34.Dockerfile
new file mode 100644
index 000000000..be2a92cd5
--- /dev/null
+++ b/.ci/docker/uhd-builder-fedora34.Dockerfile
@@ -0,0 +1,36 @@
+# please follow docker best practices
+# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
+
+FROM fedora:34
+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 \
+        && \
+    dnf clean all
diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml
index 43514f527..9a3e5082f 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-32-builder':{'dockerOSName':'fedora32','dockerImageName':'uhd-builder-fedora32'},
-    'Fedora-33-builder':{'dockerOSName':'fedora33','dockerImageName':'uhd-builder-fedora33'},
+    "{'Fedora-33-builder':{'dockerOSName':'fedora33','dockerImageName':'uhd-builder-fedora33'},
+    'Fedora-34-builder':{'dockerOSName':'fedora34','dockerImageName':'uhd-builder-fedora34'},
     'Ubuntu-1804-builder':{'dockerOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804'},
     'Ubuntu-2004-builder':{'dockerOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004'}}"
 - name: winDockerImages
-- 
cgit v1.2.3