From da9ef9585ad8f4a9c1feaa8c7c6be2d284259144 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Thu, 7 Dec 2023 15:23:25 +0100
Subject: [PATCH] ci: more testing

---
 .forgejo/actions/setup-docker/action.yml | 23 +++++++++++++++++
 .forgejo/actions/setup/action.yml        |  1 +
 .forgejo/workflows/build.yml             | 32 ++++++------------------
 3 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 .forgejo/actions/setup-docker/action.yml

diff --git a/.forgejo/actions/setup-docker/action.yml b/.forgejo/actions/setup-docker/action.yml
new file mode 100644
index 0000000..1c936b0
--- /dev/null
+++ b/.forgejo/actions/setup-docker/action.yml
@@ -0,0 +1,23 @@
+# action.yml
+name: setup-docker
+description: 'setup docker'
+
+runs:
+  using: 'composite'
+  steps:
+    - shell: bash
+      name: create cache
+      run: |
+        install -m 0755 -d /etc/apt/keyrings
+        curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+        chmod a+r /etc/apt/keyrings/docker.gpg
+        echo \
+          "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
+          $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+          tee /etc/apt/sources.list.d/docker.list > /dev/null
+        apt-get update -qq
+        apt-get  -q install -qq \
+          containerd.io \
+          docker-ce \
+          docker-ce-cli \
+          ;
diff --git a/.forgejo/actions/setup/action.yml b/.forgejo/actions/setup/action.yml
index 5ded40e..01afeaf 100644
--- a/.forgejo/actions/setup/action.yml
+++ b/.forgejo/actions/setup/action.yml
@@ -9,6 +9,7 @@ runs:
       name: create cache
       run: |
         mkdir -p /opt/hostedtoolcache
+        mkdir -p /srv/forgejo-renovate/.cache/act/tool_cache
     - shell: bash
       name: install deps
       run: |
diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index b1a2498..e9de3ce 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -73,7 +73,7 @@ jobs:
   #     - run: ct lint --config tools/ct.yml --charts .
 
   e2e:
-    runs-on: docker
+    runs-on: self-hosted
 
     strategy:
       matrix:
@@ -93,31 +93,12 @@ jobs:
       - uses: ./.forgejo/actions/setup
 
       - name: Install chart-testing
-        uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
+        # TODO: pin to version when this is released: https://github.com/helm/chart-testing-action/pull/137
+        uses: helm/chart-testing-action@86b540ddcecb3cc009fa2bc0f44fa5b33e9751a2 # main
         with:
           version: ${{ env.HELM_CHART_TESTING_VERSION }}
 
-      - name: install docker
-        run: |
-          install -m 0755 -d /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-          chmod a+r /etc/apt/keyrings/docker.gpg
-          echo \
-            "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
-            $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
-            tee /etc/apt/sources.list.d/docker.list > /dev/null
-          apt-get update -qq
-          apt-get  -q install -qq \
-            docker-ce-cli \
-            ;
-
-      # - run: pip3 install yamllint yamale
-
-      # - name: install kind ${{ env.KIND_VERSION }}
-      #   run: |
-      #     curl -Lo /usr/local/bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64"
-      #     chmod +x /usr/local/bin/kind
-      #     kind --version
+      - uses: ./.forgejo/actions/setup-docker
 
       # - name: install chart-testing ${{ env.HELM_CHART_TESTING_VERSION }}
       #   run: |
@@ -132,8 +113,6 @@ jobs:
 
       - run: docker ps
 
-      - run: env
-
       - name: Create kind cluster
         uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
         with:
@@ -142,6 +121,9 @@ jobs:
 
       - run: kubectl get no -o wide
 
+      - name: install chart
+        run: ct install --config tools/ct.yml --charts .
+
   # # Catch-all required check for test matrix
   # test-success:
   #   needs: