From 52aecf1094bd11409bf8de39d3d79cf0dfd54338 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 4 Dec 2021 11:04:24 +0100
Subject: [PATCH] fix(tests): use GHCR for install tests (#1461)

* fix(tests): use GHCR for install tests

* bump jackett to test ci

* also use ghcr.io for other tests

* actually process all yaml files to ghcr, not just values.yaml
---
 .github/workflows/apps.release.yaml | 2 +-
 .github/workflows/apps.test.yaml    | 6 +++---
 .github/workflows/common.test.yaml  | 2 +-
 charts/stable/jackett/Chart.yaml    | 2 +-
 tools/build-release.sh              | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/apps.release.yaml b/.github/workflows/apps.release.yaml
index a7590ab465c..d74c472c11a 100644
--- a/.github/workflows/apps.release.yaml
+++ b/.github/workflows/apps.release.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     concurrency: gitpush
     container:
-      image: tccr.io/truecharts/devcontainer:v2.1.0
+      image: ghcr.io/truecharts/devcontainer:v2.1.0
     steps:
 
       - uses: actions/checkout@v2
diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml
index d936912b968..6ef94ee61a8 100644
--- a/.github/workflows/apps.test.yaml
+++ b/.github/workflows/apps.test.yaml
@@ -146,7 +146,7 @@ jobs:
       ## TODO: Fix common-test
       - name: Run chart-testing (install)
         if: ${{ matrix.app != 'common' &&  matrix.app != '.gitkee' && steps.prep-lint.outputs.install != 'false' }}
-        run: ct install --config .github/ct-install.yaml --charts 'charts/${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}'
+        run: find ./charts/${{ steps.prep-lint.outputs.train }}/${{ matrix.app }} -type f -name *.yaml -exec sed -i 's/tccr.io/ghcr.io/gI' {} \; && ct install --config .github/ct-install.yaml --charts 'charts/${{ steps.prep-lint.outputs.train }}/${{ matrix.app }}'
 
   app-tests-complete:
     needs: [app-tests]
@@ -159,7 +159,7 @@ jobs:
   release-test:
     runs-on: ubuntu-latest
     container:
-      image: tccr.io/truecharts/devcontainer:v2.1.0
+      image: ghcr.io/truecharts/devcontainer:v2.1.0
     steps:
       - name: Cache helm repo cache
         id: cache
@@ -183,4 +183,4 @@ jobs:
 
       - name: build-and-run
         run: |
-          tools/build-release.sh --config .github/cr.yaml
+          find ./ -type f -name *.yaml -exec sed -i 's/tccr.io/ghcr.io/gI' {} \; && tools/build-release.sh --config .github/cr.yaml
diff --git a/.github/workflows/common.test.yaml b/.github/workflows/common.test.yaml
index eeaa189dbdb..2ff50774af0 100644
--- a/.github/workflows/common.test.yaml
+++ b/.github/workflows/common.test.yaml
@@ -106,4 +106,4 @@ jobs:
           version: v1.19
 
       - name: Run chart-testing (install)
-        run: ct install --config .github/ct-install.yaml --charts 'charts/library/common-test'
+        run: find ./charts/library/common-test -type f -name *.yaml -exec sed -i 's/tccr.io/ghcr.io/gI' {} \; && ct install --config .github/ct-install.yaml --charts 'charts/library/common-test'
diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml
index 926eee3857e..84c7867d47f 100644
--- a/charts/stable/jackett/Chart.yaml
+++ b/charts/stable/jackett/Chart.yaml
@@ -21,7 +21,7 @@ name: jackett
 sources:
 - https://github.com/Jackett/Jackett
 type: application
-version: 9.0.29
+version: 9.0.30
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/tools/build-release.sh b/tools/build-release.sh
index ed80e6e40f4..1f9cdae4f32 100755
--- a/tools/build-release.sh
+++ b/tools/build-release.sh
@@ -319,7 +319,8 @@ container_sec_scan() {
       echo "**Container: ${container}**" >> ${chart}/sec-scan.md
       echo "" >> ${chart}/sec-scan.md
       echo '```' >> ${chart}/sec-scan.md
-      trivy image ${container} >> ${chart}/sec-scan.md
+      ghcrcont=$(echo ${container} | sed "s/tccr.io/ghcr.io/g")
+      trivy image ${ghcrcont} >> ${chart}/sec-scan.md
       echo '```' >> ${chart}/sec-scan.md
       echo "" >> ${chart}/sec-scan.md
       done