From 6095573cc8eaea9a687f5b8086beda151fff2336 Mon Sep 17 00:00:00 2001 From: Brent Boe Date: Mon, 16 Sep 2019 12:44:45 -0700 Subject: [PATCH 1/5] Revert 7.3.1 --- Makefile | 4 ++-- base/redhat-8/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1b7ff053..28e4508f 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.1 -SPLUNK_BUILD := bd63e13aa157 +SPLUNK_VERSION := 7.3.0 +SPLUNK_BUILD := 657388c7a488 ifeq ($(shell arch), s390x) SPLUNK_ARCH = s390x else diff --git a/base/redhat-8/Dockerfile b/base/redhat-8/Dockerfile index aec43604..af730957 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.1" \ + version="7.3.0" \ 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." From a4adaeff513cf6975f07dfccaf346e4c58b959d4 Mon Sep 17 00:00:00 2001 From: tonyl Date: Thu, 19 Sep 2019 12:19:12 -0700 Subject: [PATCH 2/5] Up version --- Makefile | 4 ++-- base/redhat-8/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 28e4508f..aa5a7ed9 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 +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..aec43604 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" \ 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." From 409beed0fe855db58f9b6daf53c5286bed8ab03d Mon Sep 17 00:00:00 2001 From: tonyl Date: Thu, 19 Sep 2019 12:20:11 -0700 Subject: [PATCH 3/5] Up version --- Makefile | 2 +- base/redhat-8/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index aa5a7ed9..7938f287 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ 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.1 +SPLUNK_VERSION := 7.3.1.1 SPLUNK_BUILD := 7651b7244cf2 ifeq ($(shell arch), s390x) SPLUNK_ARCH = s390x diff --git a/base/redhat-8/Dockerfile b/base/redhat-8/Dockerfile index aec43604..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.1" \ + 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." From add1eff39549af4b5f2182a51f750cac1aa56495 Mon Sep 17 00:00:00 2001 From: tonyl Date: Thu, 19 Sep 2019 15:34:58 -0700 Subject: [PATCH 4/5] Regex fix for exclude list --- splunk/common-files/make-minimal-exclude.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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": From 1bbca53afd10681d5ecdb0c1d52d2c7f6089655f Mon Sep 17 00:00:00 2001 From: tonyl Date: Thu, 19 Sep 2019 18:06:07 -0700 Subject: [PATCH 5/5] Updating to debian 10 test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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