nfs-ganesha: enable centos8 for arm64, handle lowercase repo names

Signed-off-by: Dan Mick <dmick@redhat.com>

diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm
index 838214f46dc4ab0aca26b686b8f197a23cc81a99..d2328614b5a80aeb1633dbb072dafcc96604880e 100644 (file)
--- a/nfs-ganesha/build/build_rpm
+++ b/nfs-ganesha/build/build_rpm
@@ -18,7 +18,7 @@ fi
 # Some  -devel packages are only available in the CentOS 8 PowerTools repo. Enable it:
 if [ $DIST = centos8 ]
 then
-       sudo yum-config-manager --enable PowerTools
+       sudo yum-config-manager --enable PowerTools || sudo yum-config-manager --enable powertools
 fi
 
 # Clean up Jenkins slave before each build

diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml
index 268309431004923c2001a1b30a8061053b002693..31d2574ed7a9bd5f29f6c78262c4965bc12c33f5 100644 (file)
--- a/nfs-ganesha/config/definitions/nfs-ganesha.yml
+++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml
@@ -84,7 +84,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")))
+       combination-filter: DIST==AVAILABLE_DIST && ARCH==AVAILABLE_ARCH && (ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7" || DIST == "centos8")))
     axes:
       - axis:
           type: label-expression