Update ci-main.yaml

Author: pdudhaiya-crest

.github/workflows/ci-main.yaml

@@ -284,19 +284,19 @@ jobs:
   test-name-cache:
     strategy:
       matrix: 
-        deployment_type: ["docker", "podman"]
         SC4S_IPV6_ENABLE: ["yes","no"]
     runs-on: ubuntu-latest
-    continue-on-error: true
     needs:
       - meta
       - build_action
-
+    # runs all of the steps inside the specified container rather than on the VM host.
+    # Because of this the network configuration changes from host based network to a container network.
+    container:
+      image: python:3.9-buster
     services:
       splunk:
         image: splunk/splunk:${{ fromJson(needs.meta.outputs.matrix_supportedSplunk)[0].version }}
         ports:
-          - 8000:8000
           - 8088:8088
           - 8089:8089
         env:
@@ -305,55 +305,24 @@ jobs:
           SPLUNK_START_ARGS: --accept-license
           SPLUNK_APPS_URL: https://github.com/splunk/splunk-configurations-base-indexes/releases/download/v1.0.0/splunk_configurations_base_indexes-1.0.0.tar.gz
 
+      sc4s:
+        image: ${{ needs.meta.outputs.container_base }}
+        ports:
+          - 514:514
+        env:
+          SC4S_DEST_SPLUNK_HEC_DEFAULT_URL: https://splunk:8088
+          SC4S_DEST_SPLUNK_HEC_DEFAULT_TOKEN: 70b6ae71-76b3-4c38-9597-0c5b37ad9630
+          SC4S_DEST_SPLUNK_HEC_DEFAULT_TLS_VERIFY: "no"
+          SC4S_USE_NAME_CACHE: "yes"
+          SC4S_CLEAR_NAME_CACHE: "yes"
+          SC4S_IPV6_ENABLE: "${{ matrix.SC4S_IPV6_ENABLE }}"
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: false
           persist-credentials: false
-      - name: Install Ansible and other dependencies as python package
-        run: |
-          pip install ansible~=6.1.0 --no-cache-dir \
-          && pip install pywinrm>=0.4.2 --no-cache-dir \
-          && pip install ansible-lint>=6.0.0 --no-cache-dir \
-          && pip install docker
-      - name: Configure Ansible Environment Variables
-        env:
-          ANSIBLE_CONFIG: ansible.cfg
-          ANSIBLE_HOST_KEY_CHECKING: False
-        run: |
-          echo "ANSIBLE_CONFIG is set to: $ANSIBLE_CONFIG"
-          echo "ANSIBLE_HOST_KEY_CHECKING is set to: $ANSIBLE_HOST_KEY_CHECKING"
-          sudo systemctl set-environment SC4S_IMAGE=${{ needs.meta.outputs.container_base }}
-      - name: Update inventory file
-        run: |
-          cat << EOF > ansible/inventory/inventory.yaml
-          ---
-          all:
-            hosts:
-            children:
-              node:
-                hosts:
-                  node_1:
-                    ansible_host: 127.0.0.1
-                    ansible_connection: local
-                    ansible_user: root
-      - name: Update env_file
-        run: |
-          echo "Updating ansible/inventory/inventory.yaml"
-          cat << EOF > ansible/resources/env_file
-          SC4S_DEST_SPLUNK_HEC_DEFAULT_URL=https://127.0.0.1:8088
-          SC4S_DEST_SPLUNK_HEC_DEFAULT_TOKEN=70b6ae71-76b3-4c38-9597-0c5b37ad9630
-          SC4S_DEST_SPLUNK_HEC_DEFAULT_TLS_VERIFY=no
-          SC4S_USE_NAME_CACHE=yes
-          SC4S_CLEAR_NAME_CACHE=yes
-          SC4S_IPV6_ENABLE=${{ matrix.SC4S_IPV6_ENABLE }}
-      - name: Update current SC4S image in unit file
-        run: |
-          sed -i 's|Environment="SC4S_IMAGE=ghcr.io/splunk/splunk-connect-for-syslog/container3:latest"|Environment="SC4S_IMAGE=${{ needs.meta.outputs.container_base }}"|' ansible/resources/${{ matrix.deployment_type }}_sc4s.service
-      - name: Run Ansible Playbook
-        run: |
-          ansible-playbook --connection=local -i ansible/inventory/inventory.yaml ansible/playbooks/${{ matrix.deployment_type }}.yml 
       - name: Run tests
         run: |
           pip3 install poetry
@@ -362,15 +331,15 @@ jobs:
           poetry run pytest -v --tb=long \
             --splunk_type=external \
             --splunk_hec_token=70b6ae71-76b3-4c38-9597-0c5b37ad9630 \
-            --splunk_host=127.0.0.1 \
-            --sc4s_host=127.0.0.1 \
+            --splunk_host=splunk \
+            --sc4s_host=sc4s \
             --junitxml=test-results/test.xml \
             -n 1 \
             -m 'name_cache'
       - name: artifact-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: test-name-cache-results_${{ matrix.deployment_type }}_IPv6_${{ matrix.SC4S_IPV6_ENABLE }}.xml
+          name: test-name-cache-results_IPv6_${{ matrix.SC4S_IPV6_ENABLE }}.xml
           path: test-results/test.xml
         if: ${{ !cancelled() }}