From 03762d68daa0ad1ba983221a57a7e16f756602b7 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe Date: Tue, 7 Jul 2020 14:46:56 -0300 Subject: [PATCH] buildlib: Update to FC32 FC32 can install its packages now, so switch to it. Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 2 +- buildlib/cbuild | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index f2f24c643..f2a86b468 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -34,7 +34,7 @@ resources: image: ucfconsort.azurecr.io/rdma-core/centos8:25.0 endpoint: ucfconsort_registry - container: fedora - image: ucfconsort.azurecr.io/rdma-core/fc31:25.0 + image: ucfconsort.azurecr.io/rdma-core/fc32:31.0 endpoint: ucfconsort_registry - container: xenial image: ucfconsort.azurecr.io/rdma-core/ubuntu-16.04:28.0 diff --git a/buildlib/cbuild b/buildlib/cbuild index 23879b25f..f9f8d2eda 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -234,10 +234,10 @@ class centos8(Environment): " ".join(sorted(self.pkgs)))); return res; -class fc31(Environment): - docker_parent = "fedora:31"; +class fc32(Environment): + docker_parent = "fedora:32"; pkgs = centos8.pkgs - name = "fc31"; + name = "fc32"; specfile = "redhat/rdma-core.spec"; ninja_cmd = "ninja-build"; is_rpm = True; @@ -521,7 +521,7 @@ environments = [centos6(), focal(), jessie(), stretch(), - fc31(), + fc32(), leap(), tumbleweed(), debian_experimental(),