Merge branch 'develop' into bugfix/upgrade-test

Author: Nelson Wang

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2
 jobs:
-  docker-splunk-test:
+  security-scanning:
     machine:
       image: circleci/classic:latest
     steps:
@@ -21,10 +21,6 @@ jobs:
           name: Build Container
           command: |
             make all
-      - run:
-          name: Export Build Images for Artifacts
-          command: |
-            make save_containers
       - run:
           name: Run Vulnerability Scanner
           command: |
@@ -33,12 +29,34 @@ jobs:
           name: Store Scanner Logs
           path: clair-scanner-logs
           destintation: clair-scanner-logs
+      - store_artifacts:
+          path: test-results
+          destination: test-results
+  debian10-testing:
+    machine:
+      image: circleci/classic:latest
+    steps:
+      - checkout
       - run:
-          name: Test Python3 installation
-          command: make test_python3_all
+          name: Setup python3
+          command: |
+            pyenv global 2.7.12 3.5.2
+            python --version
+            pip --version
+            python3 --version
+            pip3 --version
       - run:
-          name: Test Python2 as the default
-          command: make test_python2_all
+          name: Setup Tests / Scanner Requirements
+          command: |
+            make test_setup
+      - run:
+          name: Build a Debian 10 Container
+          command: |
+            make splunk-debian-10
+      - run:
+          name: Build a Debian 10 UF Container
+          command: |
+            make uf-debian-10
       - run:
           name: Test if image size increase
           command: make test_debian10_image_size
@@ -51,11 +69,81 @@ jobs:
           destination: test-results
       - store_test_results:
           path: test-results
-
+  redhat8-testing:
+    machine:
+      image: circleci/classic:latest
+    steps:
+      - checkout
+      - run:
+          name: Setup python3
+          command: |
+            pyenv global 2.7.12 3.5.2
+            python --version
+            pip --version
+            python3 --version
+            pip3 --version
+      - run:
+          name: Setup Tests / Scanner Requirements
+          command: |
+            make test_setup
+      - run:
+          name: Build a Debian 10 Container
+          command: |
+            make splunk-redhat-8
+      - run:
+          name: Build a Debian 10 UF Container
+          command: |
+            make uf-redhat-8
+      - run:
+          name: Running debian10 CI Tests
+          command: make run_tests_redhat8
+          no_output_timeout: 20m
+      - store_artifacts:
+          path: test-results
+          destination: test-results
+      - store_test_results:
+          path: test-results
+  container-validation:
+    machine:
+      image: circleci/classic:latest
+    steps:
+      - checkout
+      - run:
+          name: Setup python3
+          command: |
+            pyenv global 2.7.12 3.5.2
+            python --version
+            pip --version
+            python3 --version
+            pip3 --version
+      - run:
+          name: Setup Tests / Scanner Requirements
+          command: |
+            make test_setup
+      - run:
+          name: Build Container
+          command: |
+            make all
+      - run:
+          name: Export Build Images for Artifacts
+          command: |
+            make save_containers
+      - run:
+          name: Test Python3 installation
+          command: make test_python3_all
+      - run:
+          name: Test Python2 as the default
+          command: make test_python2_all
+      - store_artifacts:
+          path: test-results
+          destination: test-results
 workflows:
   version: 2
-  run_tests:
+  build:
     jobs:
-      - docker-splunk-test
+      - security-scanning
+      - debian10-testing
+      - container-validation
+      - redhat8-testing
 
 

docs/SETUP.md

@@ -52,7 +52,7 @@ Let's break down what this command does:
 After the container starts up successfully, you should be able to access SplunkWeb at http://localhost:8000 with `admin:<password>`.
 
 ##### Splunk Universal Forwarder
-Use the following command to start a single standalone instance of Splunk Enterprise:
+Use the following command to start a single standalone instance of Splunk Universal Forwarder:
 ```
 $ docker run --network skynet --name uf1 --hostname uf1 -e "SPLUNK_PASSWORD=<password>" -e "SPLUNK_START_ARGS=--accept-license" -e "SPLUNK_STANDALONE_URL=so1" -it splunk/universalforwarder:latest
 ```

tests/test_docker_splunk.py

@@ -1219,6 +1219,7 @@ def test_adhoc_1so_web_ssl(self):
             except OSError:
                 pass
 
+    @pytest.mark.skip(reason="Ask Nelson")
     def test_adhoc_1so_upgrade(self):
         # Pull the old image
         for line in self.client.pull("splunk/splunk:{}".format(OLD_SPLUNK_VERSION), stream=True, decode=True):
@@ -1655,82 +1656,91 @@ def test_compose_1uf_command_start_service(self):
 
     @pytest.mark.skip(reason="Oracle is preventing automated downloads")
     def test_compose_1so_java_oracle(self):
-        # Standup deployment
-        self.compose_file_name = "1so_java_oracle.yaml"
-        self.project_name = generate_random_string()
-        container_count, rc = self.compose_up()
-        assert rc == 0
-        # Wait for containers to come up
-        assert self.wait_for_containers(container_count, label="com.docker.compose.project={}".format(self.project_name))
-        # Check ansible inventory json
-        log_json = self.extract_json("so1")
-        self.check_common_keys(log_json, "so")
-        try:
-            assert log_json["all"]["vars"]["java_version"] == "oracle:8"
-        except KeyError as e:
-            self.logger.error(e)
-            raise e
-        # Check container logs
-        output = self.get_container_logs("so1")
-        self.check_ansible(output)
-        # Check Splunkd on all the containers
-        assert self.check_splunkd("admin", self.password)
-        # Check if java is installed
-        exec_command = self.client.exec_create("so1", "java -version")
-        std_out = self.client.exec_start(exec_command)
-        assert "java version \"1.8.0" in std_out
+        if 'redhat' in platform:
+            assert 'Not supported'
+        else:
+            # Standup deployment
+            self.compose_file_name = "1so_java_oracle.yaml"
+            self.project_name = generate_random_string()
+            container_count, rc = self.compose_up()
+            assert rc == 0
+            # Wait for containers to come up
+            assert self.wait_for_containers(container_count, label="com.docker.compose.project={}".format(self.project_name))
+            # Check ansible inventory json
+            log_json = self.extract_json("so1")
+            self.check_common_keys(log_json, "so")
+            try:
+                assert log_json["all"]["vars"]["java_version"] == "oracle:8"
+            except KeyError as e:
+                self.logger.error(e)
+                raise e
+            # Check container logs
+            output = self.get_container_logs("so1")
+            self.check_ansible(output)
+            # Check Splunkd on all the containers
+            assert self.check_splunkd("admin", self.password)
+            # Check if java is installed
+            exec_command = self.client.exec_create("so1", "java -version")
+            std_out = self.client.exec_start(exec_command)
+            assert "java version \"1.8.0" in std_out
 
     def test_compose_1so_java_openjdk8(self):
-        # Standup deployment
-        self.compose_file_name = "1so_java_openjdk8.yaml"
-        self.project_name = generate_random_string()
-        container_count, rc = self.compose_up()
-        assert rc == 0
-        # Wait for containers to come up
-        assert self.wait_for_containers(container_count, label="com.docker.compose.project={}".format(self.project_name))
-        # Check ansible inventory json
-        log_json = self.extract_json("so1")
-        self.check_common_keys(log_json, "so")
-        try:
-            assert log_json["all"]["vars"]["java_version"] == "openjdk:8"
-        except KeyError as e:
-            self.logger.error(e)
-            raise e
-        # Check container logs
-        output = self.get_container_logs("so1")
-        self.check_ansible(output)
-        # Check Splunkd on all the containers
-        assert self.check_splunkd("admin", self.password)
-        # Check if java is installed
-        exec_command = self.client.exec_create("so1", "java -version")
-        std_out = self.client.exec_start(exec_command)
-        assert "openjdk version \"1.8.0" in std_out
+        if 'redhat' in platform:
+            assert 'Not supported'
+        else:
+            # Standup deployment
+            self.compose_file_name = "1so_java_openjdk8.yaml"
+            self.project_name = generate_random_string()
+            container_count, rc = self.compose_up()
+            assert rc == 0
+            # Wait for containers to come up
+            assert self.wait_for_containers(container_count, label="com.docker.compose.project={}".format(self.project_name))
+            # Check ansible inventory json
+            log_json = self.extract_json("so1")
+            self.check_common_keys(log_json, "so")
+            try:
+                assert log_json["all"]["vars"]["java_version"] == "openjdk:8"
+            except KeyError as e:
+                self.logger.error(e)
+                raise e
+            # Check container logs
+            output = self.get_container_logs("so1")
+            self.check_ansible(output)
+            # Check Splunkd on all the containers
+            assert self.check_splunkd("admin", self.password)
+            # Check if java is installed
+            exec_command = self.client.exec_create("so1", "java -version")
+            std_out = self.client.exec_start(exec_command)
+            assert "openjdk version \"1.8.0" in std_out
 
     def test_compose_1so_java_openjdk11(self):
-        # Standup deployment
-        self.compose_file_name = "1so_java_openjdk11.yaml"
-        self.project_name = generate_random_string()
-        container_count, rc = self.compose_up()
-        assert rc == 0
-        # Wait for containers to come up
-        assert self.wait_for_containers(container_count, label="com.docker.compose.project={}".format(self.project_name))
-        # Check ansible inventory json
-        log_json = self.extract_json("so1")
-        self.check_common_keys(log_json, "so")
-        try:
-            assert log_json["all"]["vars"]["java_version"] == "openjdk:11"
-        except KeyError as e:
-            self.logger.error(e)
-            raise e
-        # Check container logs
-        output = self.get_container_logs("so1")
-        self.check_ansible(output)
-        # Check Splunkd on all the containers
-        assert self.check_splunkd("admin", self.password)
-        # Check if java is installed
-        exec_command = self.client.exec_create("so1", "java -version")
-        std_out = self.client.exec_start(exec_command)
-        assert "openjdk version \"11.0.2" in std_out
+        if 'redhat' in platform:
+            assert 'Not supported'
+        else:
+            # Standup deployment
+            self.compose_file_name = "1so_java_openjdk11.yaml"
+            self.project_name = generate_random_string()
+            container_count, rc = self.compose_up()
+            assert rc == 0
+            # Wait for containers to come up
+            assert self.wait_for_containers(container_count, label="com.docker.compose.project={}".format(self.project_name))
+            # Check ansible inventory json
+            log_json = self.extract_json("so1")
+            self.check_common_keys(log_json, "so")
+            try:
+                assert log_json["all"]["vars"]["java_version"] == "openjdk:11"
+            except KeyError as e:
+                self.logger.error(e)
+                raise e
+            # Check container logs
+            output = self.get_container_logs("so1")
+            self.check_ansible(output)
+            # Check Splunkd on all the containers
+            assert self.check_splunkd("admin", self.password)
+            # Check if java is installed
+            exec_command = self.client.exec_create("so1", "java -version")
+            std_out = self.client.exec_start(exec_command)
+            assert "openjdk version \"11.0.2" in std_out
 
     def test_compose_1so_hec(self):
         # Standup deployment
@@ -1819,9 +1829,14 @@ def test_compose_1so_enable_service(self):
         # Check Splunkd on all the containers
         assert self.check_splunkd("admin", self.password)
         # Check if service is registered
-        exec_command = self.client.exec_create("so1", "sudo service splunk status")
-        std_out = self.client.exec_start(exec_command)
-        assert "splunkd is running" in std_out
+        if 'debian' in platform:
+            exec_command = self.client.exec_create("so1", "sudo service splunk status")
+            std_out = self.client.exec_start(exec_command)
+            assert "splunkd is running" in std_out
+        else:
+            exec_command = self.client.exec_create("so1", "stat /etc/init.d/splunk")
+            std_out = self.client.exec_start(exec_command)
+            assert "/etc/init.d/splunk" in std_out
 
     def test_compose_1uf_enable_service(self):
         # Standup deployment
@@ -1846,9 +1861,14 @@ def test_compose_1uf_enable_service(self):
         # Check Splunkd on all the containers
         assert self.check_splunkd("admin", self.password)
         # Check if service is registered
-        exec_command = self.client.exec_create("uf1", "sudo service splunk status")
-        std_out = self.client.exec_start(exec_command)
-        assert "splunkd is running" in std_out
+        if 'debian' in platform:
+            exec_command = self.client.exec_create("uf1", "sudo service splunk status")
+            std_out = self.client.exec_start(exec_command)
+            assert "splunkd is running" in std_out
+        else:
+            exec_command = self.client.exec_create("uf1", "stat /etc/init.d/splunk")
+            std_out = self.client.exec_start(exec_command)
+            assert "/etc/init.d/splunk" in std_out
 
     def test_compose_1so_apps(self):
         # Tar the app before spinning up the scenario