Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
command: make test_debian9_image_size
- run:
name: Running debian9 CI Tests
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not that important, but should rename this as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup I noticed that. Let's change this after this release since we are short on time for this release.

command: make run_tests_debian9
command: make run_tests_debian10
no_output_timeout: 20m
- store_artifacts:
path: test-results
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion base/redhat-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion splunk/common-files/make-minimal-exclude.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down