From 64aa712dab2aa6c4d6f834ee3165acc80cec0b45 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 10 Apr 2021 15:05:29 +0200
Subject: [PATCH] Add dev train and excluded common-test chart.lock (#318)

---
 .github/workflows/apps.test.yaml              | 12 +++++++++-
 .github/workflows/charts.renovate.yaml        | 16 +++++++++++++
 .gitignore                                    |  1 +
 .tools/copy-common.sh                         | 12 ++++++++++
 .tools/fixfolders.sh                          |  2 +-
 .tools/gen-helm-docs.sh                       |  2 --
 dev/placeholder/6.6.6/.helmignore             | 24 +++++++++++++++++++
 dev/placeholder/6.6.6/Chart.yaml              | 19 +++++++++++++++
 dev/placeholder/6.6.6/README.md               |  0
 dev/placeholder/6.6.6/app-readme.md           |  0
 dev/placeholder/6.6.6/ix_values.yaml          |  1 +
 dev/placeholder/6.6.6/questions.yaml          |  6 +++++
 .../6.6.6/templates/placeholder.yaml          |  0
 dev/placeholder/6.6.6/test_values.yaml        |  1 +
 dev/placeholder/6.6.6/values.yaml             |  1 +
 dev/placeholder/item.yaml                     |  3 +++
 16 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 dev/placeholder/6.6.6/.helmignore
 create mode 100644 dev/placeholder/6.6.6/Chart.yaml
 create mode 100644 dev/placeholder/6.6.6/README.md
 create mode 100644 dev/placeholder/6.6.6/app-readme.md
 create mode 100644 dev/placeholder/6.6.6/ix_values.yaml
 create mode 100644 dev/placeholder/6.6.6/questions.yaml
 create mode 100644 dev/placeholder/6.6.6/templates/placeholder.yaml
 create mode 100644 dev/placeholder/6.6.6/test_values.yaml
 create mode 100644 dev/placeholder/6.6.6/values.yaml
 create mode 100644 dev/placeholder/item.yaml

diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml
index 7e3f9725f2b..cb11c17e8ec 100644
--- a/.github/workflows/apps.test.yaml
+++ b/.github/workflows/apps.test.yaml
@@ -21,6 +21,13 @@ on:
       - '!incubator/**/app-readme.md'
       - '!incubator/**/app-readme.md.gotmpl'
       - '!incubator/**/docs/*'
+      - 'dev/**'
+      - '!dev/**/*.md'
+      - '!dev/**/README.md'
+      - '!dev/**/README.md.gotmpl'
+      - '!dev/**/app-readme.md'
+      - '!dev/**/app-readme.md.gotmpl'
+      - '!dev/**/docs/*'
       - '.github/workflows/apps.test.yaml'
       - '.github/ct-install.yaml'
       - '.github/ct-lint.yaml'
@@ -54,6 +61,7 @@ jobs:
           changed:
           - 'stable/**'
           - 'incubator/**'
+          - 'dev/**'
     - run: echo '${{ toJson(steps.filter.outputs) }}' > changes.json
     - id: reduce
       run: |
@@ -78,8 +86,10 @@ jobs:
         run: |
             if test -f "./stable/${{ matrix.app }}/item.yaml"; then
               train="stable"
-            else
+            elif test -f "./incubator/${{ matrix.app }}/item.yaml"; then
               train="incubator"
+            else
+              train="dev"
             fi
             echo ::set-output name=train::${train}
             maxfolderversion=$(ls -l ${train}/${{ matrix.app }} | grep ^d | awk '{print $9}' | tail -n 1)
diff --git a/.github/workflows/charts.renovate.yaml b/.github/workflows/charts.renovate.yaml
index 9127c6ba748..b0f384284e9 100644
--- a/.github/workflows/charts.renovate.yaml
+++ b/.github/workflows/charts.renovate.yaml
@@ -42,6 +42,7 @@ jobs:
                 fi
             fi
           done
+
       - name: update folder names and dependencies for incubator
         run: |
           for chart in incubator/*; do
@@ -58,6 +59,21 @@ jobs:
             fi
           done
 
+      - name: update folder names and dependencies for incubator
+        run: |
+          for chart in dev/*; do
+            if [ -d "${chart}" ]; then
+                maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
+                maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+                chartname=$(basename ${chart})
+                echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
+                helm dependency update ${chart}/${maxfolderversion}
+                if [ "${maxfolderversion}" != "${maxchartversion}" ]; then
+                    mv -f ${chart}/${maxfolderversion} ${chart}/${maxchartversion}
+                    echo "renamed ${chart}/${maxfolderversion} to ${chart}/${maxchartversion}"
+                fi
+            fi
+          done
 
       - name: Commit and push updated charts
         run: |
diff --git a/.gitignore b/.gitignore
index 967da958d1b..cf607c2b21d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ private_values.yaml
 temp/
 library/common-test/charts/
 .cr-release-packages/
+library/common-test/chart.lock
diff --git a/.tools/copy-common.sh b/.tools/copy-common.sh
index 2033be016aa..03cd46cb0af 100755
--- a/.tools/copy-common.sh
+++ b/.tools/copy-common.sh
@@ -22,3 +22,15 @@ for chart in incubator/*; do
 
   fi
 done
+
+for chart in dev/*; do
+  if [ -d "${chart}" ]; then
+      maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
+      chartname=$(basename ${chart})
+      echo "Processing: ${chart} - folder: ${maxfolderversion} - version: ${maxchartversion}"
+
+	   rm -Rf ${chart}/${maxfolderversion}/charts/*.tgz
+       cp -f library/common-test/charts/* ${chart}/${maxfolderversion}/charts/
+
+  fi
+done
diff --git a/.tools/fixfolders.sh b/.tools/fixfolders.sh
index 0886a8b3c60..929b410de6b 100755
--- a/.tools/fixfolders.sh
+++ b/.tools/fixfolders.sh
@@ -29,7 +29,7 @@ for chart in stable/*; do
 done
 
 
-for chart in beta/*; do
+for chart in dev/*; do
   if [ -d "${chart}" ]; then
       maxfolderversion=$(ls -l ${chart} | grep ^d | awk '{print $9}' | tail -n 1)
       maxchartversion=$(cat ${chart}/${maxfolderversion}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
diff --git a/.tools/gen-helm-docs.sh b/.tools/gen-helm-docs.sh
index 656ec67f965..4976c6294c1 100755
--- a/.tools/gen-helm-docs.sh
+++ b/.tools/gen-helm-docs.sh
@@ -67,7 +67,5 @@ for chart in incubator/*; do
           --output-file="app-readme.md" \
           --template-files="${repository}/.tools/templates/docs/app-readme.md.gotmpl" \
           --chart-search-root="${chart}/${maxfolderversion}"
-
-
   fi
 done
diff --git a/dev/placeholder/6.6.6/.helmignore b/dev/placeholder/6.6.6/.helmignore
new file mode 100644
index 00000000000..e559de0a012
--- /dev/null
+++ b/dev/placeholder/6.6.6/.helmignore
@@ -0,0 +1,24 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+# OWNERS file for Kubernetes
+OWNERS
diff --git a/dev/placeholder/6.6.6/Chart.yaml b/dev/placeholder/6.6.6/Chart.yaml
new file mode 100644
index 00000000000..5d9c293897b
--- /dev/null
+++ b/dev/placeholder/6.6.6/Chart.yaml
@@ -0,0 +1,19 @@
+apiVersion: v2
+kubeVersion: ">=1.16.0-0"
+name: placeholder
+version: 6.6.6
+upstream_version: 6.6.6
+appVersion: "placeholder"
+description: THIS IS A PLACEHOLDER AND SHOULD NOT BE INSTALLED
+type: application
+deprecated: false
+home: https://github.com/truecharts/apps/tree/master/stable/jackett
+icon: https://truecharts.org/_static/img/jackett-icon.png
+keywords:
+sources:
+dependencies:
+maintainers:
+  - name: TrueCharts
+    email: info@truecharts.org
+    url: truecharts.org
+# annotations:
diff --git a/dev/placeholder/6.6.6/README.md b/dev/placeholder/6.6.6/README.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/dev/placeholder/6.6.6/app-readme.md b/dev/placeholder/6.6.6/app-readme.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/dev/placeholder/6.6.6/ix_values.yaml b/dev/placeholder/6.6.6/ix_values.yaml
new file mode 100644
index 00000000000..d877036faa4
--- /dev/null
+++ b/dev/placeholder/6.6.6/ix_values.yaml
@@ -0,0 +1 @@
+# No defaults
diff --git a/dev/placeholder/6.6.6/questions.yaml b/dev/placeholder/6.6.6/questions.yaml
new file mode 100644
index 00000000000..ee617740e99
--- /dev/null
+++ b/dev/placeholder/6.6.6/questions.yaml
@@ -0,0 +1,6 @@
+groups:
+  - name: "Container Image"
+    description: "Image to be used for container"
+
+
+questions: []
diff --git a/dev/placeholder/6.6.6/templates/placeholder.yaml b/dev/placeholder/6.6.6/templates/placeholder.yaml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/dev/placeholder/6.6.6/test_values.yaml b/dev/placeholder/6.6.6/test_values.yaml
new file mode 100644
index 00000000000..d877036faa4
--- /dev/null
+++ b/dev/placeholder/6.6.6/test_values.yaml
@@ -0,0 +1 @@
+# No defaults
diff --git a/dev/placeholder/6.6.6/values.yaml b/dev/placeholder/6.6.6/values.yaml
new file mode 100644
index 00000000000..58eb9c684b0
--- /dev/null
+++ b/dev/placeholder/6.6.6/values.yaml
@@ -0,0 +1 @@
+# This file is empty on purpose, as it should not be used with TrueNAS SCALE
diff --git a/dev/placeholder/item.yaml b/dev/placeholder/item.yaml
new file mode 100644
index 00000000000..7ecde2a6c6c
--- /dev/null
+++ b/dev/placeholder/item.yaml
@@ -0,0 +1,3 @@
+categories:
+  - placeholder
+icon_url: https://truecharts.org/_static/img/jackett-icon.png