From 97baf9e9abbbb0fe1c68e68d8c686700840d03a8 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 8 Apr 2021 19:42:34 -0700 Subject: [PATCH] nfs-ganesha: remove centos7 and xenial, build arm64 (centos8 only) Signed-off-by: Dan Mick --- nfs-ganesha/config/definitions/nfs-ganesha.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml index 82afe364..9926b99f 100644 --- a/nfs-ganesha/config/definitions/nfs-ganesha.yml +++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml @@ -52,13 +52,13 @@ - string: name: DISTROS - description: "A list of distros to build for. Available options are: bionic, centos7, centos8" - default: "centos7 centos8 bionic" + description: "A list of distros to build for. Available options are: bionic, centos8" + default: "centos8 bionic" - string: name: ARCHS - description: "A list of architectures to build for. Available options are: x86_64, and arm64" - default: "x86_64" + description: "A list of architectures to build for. Available options are: x86_64 and arm64" + default: "x86_64 arm64" - bool: name: THROWAWAY @@ -79,7 +79,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if default: "/tmp/" execution-strategy: - combination-filter: DIST==AVAILABLE_DIST && ARCH==AVAILABLE_ARCH && (ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7" || DIST == "centos8"))) + combination-filter: DIST==AVAILABLE_DIST && ARCH==AVAILABLE_ARCH && (ARCH=="x86_64" || (ARCH == "arm64" && DIST == "centos8")) axes: - axis: type: label-expression @@ -96,9 +96,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if type: label-expression name: AVAILABLE_DIST values: - - centos7 - centos8 - - xenial - bionic - axis: type: dynamic -- 2.39.5