aboutsummaryrefslogtreecommitdiffstats
path: root/.ci
diff options
context:
space:
mode:
authorSteven Koo <steven.koo@ni.com>2021-08-22 22:50:30 -0500
committerAaron Rossetto <aaron.rossetto@ni.com>2021-08-23 15:23:32 -0500
commit3111b4a230ce7534912600fe045114fed5c8ed6d (patch)
tree96b1c698e21b5da1f865d996988bba29c99f8c56 /.ci
parentc8aadd91ea8f1334160160cf53ba3c01af250d9e (diff)
downloaduhd-3111b4a230ce7534912600fe045114fed5c8ed6d.tar.gz
uhd-3111b4a230ce7534912600fe045114fed5c8ed6d.tar.bz2
uhd-3111b4a230ce7534912600fe045114fed5c8ed6d.zip
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>
Diffstat (limited to '.ci')
-rw-r--r--.ci/docker/uhd-builder-fedora34.Dockerfile (renamed from .ci/docker/uhd-builder-fedora32.Dockerfile)2
-rw-r--r--.ci/uhd-build-docker-container.yml4
2 files changed, 3 insertions, 3 deletions
diff --git a/.ci/docker/uhd-builder-fedora32.Dockerfile b/.ci/docker/uhd-builder-fedora34.Dockerfile
index e495364c9..be2a92cd5 100644
--- a/.ci/docker/uhd-builder-fedora32.Dockerfile
+++ b/.ci/docker/uhd-builder-fedora34.Dockerfile
@@ -1,7 +1,7 @@
# please follow docker best practices
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
-FROM fedora:32
+FROM fedora:34
LABEL maintainer="Ettus Research"
RUN dnf install -y \
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