diff --git a/.circleci/config.yml b/.circleci/config.yml index 639de1a8..ef34b0a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,7 +44,7 @@ jobs: command: make test_debian9_image_size - run: name: Running debian9 CI Tests - command: make run_tests_debian9 + command: make run_tests_debian10 no_output_timeout: 20m - store_artifacts: path: test-results diff --git a/Makefile b/Makefile index 28e4508f..7938f287 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ SPLUNK_ANSIBLE_BRANCH ?= develop SPLUNK_COMPOSE ?= cluster_absolute_unit.yaml # Set Splunk version/build parameters here to define downstream URLs and file names SPLUNK_PRODUCT := splunk -SPLUNK_VERSION := 7.3.0 -SPLUNK_BUILD := 657388c7a488 +SPLUNK_VERSION := 7.3.1.1 +SPLUNK_BUILD := 7651b7244cf2 ifeq ($(shell arch), s390x) SPLUNK_ARCH = s390x else diff --git a/base/redhat-8/Dockerfile b/base/redhat-8/Dockerfile index af730957..83fbff9f 100644 --- a/base/redhat-8/Dockerfile +++ b/base/redhat-8/Dockerfile @@ -20,7 +20,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal LABEL name="splunk" \ maintainer="support@splunk.com" \ vendor="splunk" \ - version="7.3.0" \ + version="7.3.1.1" \ release="1" \ summary="UBI 8 Docker image of Splunk Enterprise" \ description="Splunk Enterprise is a platform for operational intelligence. Our software lets you collect, analyze, and act upon the untapped value of big data that your technology infrastructure, security systems, and business applications generate. It gives you insights to drive operational performance and business results." diff --git a/splunk/common-files/make-minimal-exclude.py b/splunk/common-files/make-minimal-exclude.py index 54a9c3ce..52f23513 100755 --- a/splunk/common-files/make-minimal-exclude.py +++ b/splunk/common-files/make-minimal-exclude.py @@ -31,7 +31,7 @@ */share/splunk/pdf* *mrsparkle*""" -m = re.match(".*splunk-([0-9]+)\.([0-9]+)\.[0-9]+-[0-9a-z]+-Linux-[0-9a-z_-]+.tgz", sys.argv[1]) +m = re.match(".*splunk-([0-9]+)\.([0-9]+)\.[0-9]+\.?[0-9]?-[0-9a-z]+-Linux-[0-9a-z_-]+.tgz", sys.argv[1]) if m and m.group(1): if m.group(1) == "7":