Merge pull request #606 from splunk/develop

Release 9.1.0.1

Author: abdulk-splunk

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 := 9.0.5
-SPLUNK_BUILD := e9494146ae5c
+SPLUNK_VERSION := 9.1.0.1
+SPLUNK_BUILD := 77f73c9edb85
 ifeq ($(shell arch), s390x)
 	SPLUNK_ARCH = s390x
 else

base/redhat-8/install.sh

@@ -78,7 +78,7 @@ microdnf remove -y make gcc openssl-devel bzip2-devel findutils glib2-devel glib
 microdnf clean all
 
 # Install busybox direct from the multiarch since EPEL isn't available yet for redhat8
-BUSYBOX_URL=${BUSYBOX_URL:=https://busybox.net/downloads/binaries/1.35.0-`arch`-linux-musl/}
+BUSYBOX_URL=${BUSYBOX_URL:=https://busybox.net/downloads/binaries/1.35.0-`arch`-linux-musl/busybox}
 wget -O /bin/busybox ${BUSYBOX_URL}
 chmod +x /bin/busybox
 

docs/CHANGELOG.md

@@ -10,6 +10,7 @@ Red Hat images will continue to be published.
 
 ## Navigation
 
+* [9.1.0.1](#9101)
 * [9.0.5](#905)
 * [9.0.4.1](#9041)
 * [9.0.4](#904)
@@ -86,6 +87,18 @@ Red Hat images will continue to be published.
 * [7.2.1](#721)
 * [7.2.0](#720)
 
+## 9.1.0.1
+
+#### What's New?
+* Releasing new images to support Splunk Enterprise release.
+
+#### docker-splunk changes:
+* Bumping Splunk version. For details, see [Fixed issues for 9.1.0.1](https://docs.splunk.com/Documentation/Splunk/9.1.0.1/ReleaseNotes/Fixedissues#Splunk_Enterprise_9.1.0.1)
+
+#### splunk-ansible changes:
+* Docs updated
+
+---
 ## 9.0.5
 
 #### What's New?

tests/requirements.txt

@@ -1,9 +1,10 @@
-pytest
+pytest==4.4.0
+pyrsistent==0.16.1
 requests
 docker
 PyYAML
 docker-compose
 pyasn1
 junit-xml
 pytest-xdist
-pytest-rerunfailures
+pytest-rerunfailures==8.0

tests/test_single_splunk_image.py

@@ -70,28 +70,6 @@ def test_splunk_entrypoint_help(self):
         assert "SPLUNK_HOME - home directory where Splunk gets installed (default: /opt/splunk)" in output
         assert "Examples:" in output
 
-    def test_splunk_scloud(self):
-        cid = None
-        try:
-            # Run container
-            cid = self.client.create_container(self.SPLUNK_IMAGE_NAME, tty=True, command="no-provision")
-            cid = cid.get("Id")
-            self.client.start(cid)
-            # Wait a bit
-            time.sleep(5)
-            # If the container is still running, we should be able to exec inside
-            # Check that the version returns successfully for multiple users
-            for user in ["splunk", "ansible"]:
-                exec_command = self.client.exec_create(cid, "scloud version", user=user)
-                std_out = self.client.exec_start(exec_command)
-                assert "scloud version " in std_out
-        except Exception as e:
-            self.logger.error(e)
-            raise e
-        finally:
-            if cid:
-                self.client.remove_container(cid, v=True, force=True)
-
     def test_splunk_ulimit(self):
         cid = None
         try:
@@ -2662,28 +2640,6 @@ def test_adhoc_1uf_bind_mount_apps(self):
             except OSError:
                 pass
 
-    def test_uf_scloud(self):
-        cid = None
-        try:
-            # Run container
-            cid = self.client.create_container(self.UF_IMAGE_NAME, tty=True, command="no-provision")
-            cid = cid.get("Id")
-            self.client.start(cid)
-            # Wait a bit
-            time.sleep(5)
-            # If the container is still running, we should be able to exec inside
-            # Check that the version returns successfully for multiple users
-            for user in ["splunk", "ansible"]:
-                exec_command = self.client.exec_create(cid, "scloud version", user=user)
-                std_out = self.client.exec_start(exec_command)
-                assert "scloud version " in std_out
-        except Exception as e:
-            self.logger.error(e)
-            raise e
-        finally:
-            if cid:
-                self.client.remove_container(cid, v=True, force=True)
-
     def test_uf_ulimit(self):
         cid = None
         try:
@@ -2821,4 +2777,4 @@ def test_compose_1hf_splunk_add(self):
         # Check Splunkd on all the containers
         assert self.check_splunkd("admin", self.password)
         # Check Splunkd using the new users
-        assert self.check_splunkd("jerry", "seinfeld")
+        assert self.check_splunkd("jerry", "seinfeld")

uf/common-files/Dockerfile

@@ -91,6 +91,7 @@ USER root
 
 # Setup users and groups
 RUN sed -i -e 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL\nansible ALL=(splunk)NOPASSWD:ALL/g' /etc/sudoers \
+    && microdnf install systemd \
     && echo 'Create the ansible user/group' \
     && groupadd -r ${ANSIBLE_GROUP} \
     && useradd -r -m -g ${ANSIBLE_GROUP} -s /bin/bash ${ANSIBLE_USER} \