[chore] cleanup and refactor testing workflows (#373)

Signed-off-by: odubajDT <[email protected]>
Dynatrace · Nov 18, 2024 · 9506b55 · 9506b55
1 parent aecd9dd
commit 9506b55
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 292 deletions.
diff --git a/.chainsaw.yaml b/.chainsaw.yaml
diff --git a/.chainsaw_local.yaml b/.chainsaw_local.yaml
diff --git a/.github/actions/create-cluster/action.yaml b/.github/actions/create-cluster/action.yaml
@@ -10,22 +10,52 @@ inputs:
     required: false
     description: "Kubernetes version that should be used"
     # renovate: datasource=github-releases depName=kubernetes/kubernetes
-    default: "v1.27.3"
-  runtime_tag:
-    description: "Tag for the runner image"
-    required: true
+    default: "v1.27.11"
   cluster-name:
     required: false
     description: "Name of the kind cluster"
-    default: "test-cluster"
+    default: "kind"
 runs:
   using: "composite"
   steps:
 
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: "~1.22.6"
+        check-latest: true
+        cache: false
+
+    - name: Cache tools
+      id: cache-tools
+      uses: actions/cache@v4
+      with:
+        path: .tools
+        key: e2e-tools-${{ runner.os }}-${{ hashFiles('internal/tools/go.sum') }}
+
+    - name: Install tools
+      if: steps.cache-tools.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        mkdir -p .tools
+        touch .tools/*
+        make install-tools
+
     - name: "Create single kind Cluster"
       uses: helm/[email protected]
       with:
         cluster_name: ${{ inputs.cluster-name }}
         version: ${{ inputs.kind-version }}
         node_image: "kindest/node:${{ inputs.k8s-version }}"
         kubectl_version: ${{ inputs.k8s-version }}
+
+    - name: Download artifact
+      uses: actions/download-artifact@v4
+      with:
+        name: dynatrace-otel-collector-image
+        path: /tmp
+
+    - name: Load Image into Kind
+      shell: bash
+      run: |
+        kind load image-archive /tmp/dynatrace-otel-collector.tar -n ${{ inputs.cluster-name }}
diff --git a/.github/actions/deploy-prometheus/action.yaml b/.github/actions/deploy-prometheus/action.yaml
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -104,48 +104,8 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "~1.22.6"
-          check-latest: true
-          cache: false
-
-      - name: Cache tools
-        id: cache-tools
-        uses: actions/cache@v4
-        with:
-          path: .tools
-          key: e2e-tools-${{ runner.os }}-${{ hashFiles('internal/tools/go.sum') }}
-
-      - name: Install tools
-        if: steps.cache-tools.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p .tools
-          touch .tools/*
-          make install-tools
-
-      - name: Create kind cluster
-        uses: helm/[email protected]
-        with:
-          node_image: "kindest/node:v1.27.11"
-          kubectl_version: "v1.27.11"
-          cluster_name: kind
-
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: dynatrace-otel-collector-image
-          path: /tmp
-
-      - name: Load Docker image
-        run: |
-          docker load --input /tmp/dynatrace-otel-collector.tar
-
-      - name: Load Image into Kind
-        shell: bash
-        run: |
-          kind load docker-image dynatrace-otel-collector:e2e-test --name kind
+      - name: Setup cluster
+        uses: ./.github/actions/create-cluster
 
       - name: Run e2e tests
         run: |
@@ -160,48 +120,8 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "~1.22.6"
-          check-latest: true
-          cache: false
-
-      - name: Cache tools
-        id: cache-tools
-        uses: actions/cache@v4
-        with:
-          path: .tools
-          key: e2e-tools-${{ runner.os }}-${{ hashFiles('internal/tools/go.sum') }}
-
-      - name: Install tools
-        if: steps.cache-tools.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p .tools
-          touch .tools/*
-          make install-tools
-
-      - name: Create kind cluster
-        uses: helm/[email protected]
-        with:
-          node_image: "kindest/node:v1.27.11"
-          kubectl_version: "v1.27.11"
-          cluster_name: kind
-
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: dynatrace-otel-collector-image
-          path: /tmp
-
-      - name: Load Docker image
-        run: |
-          docker load --input /tmp/dynatrace-otel-collector.tar
-
-      - name: Load Image into Kind
-        shell: bash
-        run: |
-          kind load docker-image dynatrace-otel-collector:e2e-test --name kind
+      - name: Setup cluster
+        uses: ./.github/actions/create-cluster
 
       - name: Run e2e tests
         run: |

diff --git a/internal/testbed/chainsaw/prometheus-node-exporter/00-assert.yaml b/internal/testbed/chainsaw/prometheus-node-exporter/00-assert.yaml
diff --git a/internal/testbed/chainsaw/prometheus-node-exporter/chainsaw-test.yaml b/internal/testbed/chainsaw/prometheus-node-exporter/chainsaw-test.yaml
diff --git a/internal/testbed/chainsaw/syslog-receiver/00-assert.yaml b/internal/testbed/chainsaw/syslog-receiver/00-assert.yaml
diff --git a/internal/testbed/chainsaw/syslog-receiver/chainsaw-test.yaml b/internal/testbed/chainsaw/syslog-receiver/chainsaw-test.yaml
diff --git a/internal/testbed/scripts/get_dt_logs.sh b/internal/testbed/scripts/get_dt_logs.sh
diff --git a/internal/testbed/scripts/get_dt_metrics.sh b/internal/testbed/scripts/get_dt_metrics.sh
diff --git a/internal/testbed/scripts/install_prometheus_node_exporter.sh b/internal/testbed/scripts/install_prometheus_node_exporter.sh