Update Docker packaging for EL7.3

Moves the target Lustre client to 2.9.0 which supports
more recent kernels.

Also incorporates a python3 compatibility fix from
Matt Raso-Barnett. Thanks, Matt!

packaging/docker/buildonly-lustre-client/Makefile

@@ -2,12 +2,12 @@
 REPO ?= $(notdir $(CURDIR))
 
 BUILDER_URL ?= https://build.hpdd.intel.com
-LUSTRE_JOB ?= lustre-b2_8
+LUSTRE_JOB ?= lustre-b2_9
 LUSTRE_BUILD ?= lastSuccessfulBuild
 CLIENT_PACKAGE ?= lustre-client
 
 PACKAGE_URL := $(BUILDER_URL)/job/$(LUSTRE_JOB)/arch=x86_64,build_type=client,distro=el7,ib_stack=inkernel/$(LUSTRE_BUILD)
-CLIENT_VERSION := $(shell curl -sf $(PACKAGE_URL)/api/json | python -c 'import sys, json, re; pkg=[a for a in json.load(sys.stdin)["artifacts"] if re.search(r"$(CLIENT_PACKAGE)-\d+.*\.rpm", a["fileName"])][0]["fileName"]; print re.sub(r"$(CLIENT_PACKAGE)-(.*)\.x86_64\.x86_64\.rpm",r"\1",pkg)')
+CLIENT_VERSION := $(shell curl -sf $(PACKAGE_URL)/api/json | python -c 'import sys, json, re; pkg=[a for a in json.load(sys.stdin)["artifacts"] if re.match(r"^$(CLIENT_PACKAGE)-\d+.*\.rpm", a["fileName"])][0]["fileName"]; print(re.sub(r"$(CLIENT_PACKAGE)-(.*)\.x86_64(\.x86_64)?\.rpm",r"\1",pkg))')
 IMAGE := $(shell latest=$$(docker images | awk "/$(REPO).*$(CLIENT_VERSION)/ {print \$$2}"); if [ "$$latest" == $(CLIENT_VERSION) ]; then true; else echo $(REPO)/$(CLIENT_VERSION); fi)
 
 $(CLIENT_VERSION): $(IMAGE)

packaging/rpm/Makefile

@@ -39,7 +39,7 @@ $(WORKDIR)/$(SPECFILE):
 $(WORKDIR)/$(SOURCE):
 	cd ../../ && \
 	tar --owner=$(USER) --group=$(USER) \
-	    --exclude=.git --exclude=*.swp \
+	    --exclude=.git --exclude=*.swp --exclude=packaging/ci/* \
 	    --transform 's|./|$(NAME)-$(VERSION)/|' -czf $@ ./ && \
 	chown $(USER).$(USER) $@