Reorganise the trains

.github/workflows/apps.release.yaml

@@ -90,7 +90,7 @@ jobs:
           path: catalog
       - name: Remove if release already exists
         run: |
-          for train in stable incubator develop non-free deprecated
+          for train in stable incubator
           do
             for chart in master/charts/${train}/*; do
               if [ -d "${chart}/SCALE" ]; then
@@ -106,7 +106,7 @@ jobs:
           done
       - name: fetch dependencies
         run: |
-          for train in stable incubator develop non-free deprecated
+          for train in stable incubator
           do
             for chart in master/charts/${train}/*; do
               if [ -d "${chart}" ]; then
@@ -118,7 +118,7 @@ jobs:
           done
       - name: Apply SCALE Patches
         run: |
-          for train in stable incubator develop non-free deprecated
+          for train in stable incubator
           do
             for chart in master/charts/${train}/*; do
               if [ -d "${chart}/SCALE" ]; then
@@ -140,7 +140,7 @@ jobs:
           done
       - name: Add Chart release
         run: |
-          for train in stable incubator develop non-free deprecated
+          for train in stable incubator
           do
             for chart in master/charts/${train}/*; do
               if [ -f "${chart}/item.yaml" ]; then

.github/workflows/apps.test.yaml

@@ -53,9 +53,6 @@ jobs:
           changed:
           - 'charts/stable/**'
           - 'charts/incubator/**'
-          - 'charts/develop/**'
-          - 'charts/deprecated/**'
-          - 'charts/non-free/**'
           - 'charts/library/**'
     - run: echo '${{ toJson(steps.filter.outputs) }}' > changes.json
     - id: reduce
@@ -105,14 +102,10 @@ jobs:
               train="stable"
             elif test -f "./charts/incubator/${{ matrix.app }}/Chart.yaml"; then
               train="incubator"
-            elif test -f "./charts/deprecated/${{ matrix.app }}/Chart.yaml"; then
-              train="deprecated"
-            elif test -f "./charts/non-free/${{ matrix.app }}/Chart.yaml"; then
-              train="non-free"
             elif test -f "./charts/library/${{ matrix.app }}/Chart.yaml"; then
               train="library"
             else
-              train="develop"
+              train="incubator"
             fi
             echo ::set-output name=train::${train}
             if test -d "./charts/${train}/${{ matrix.app }}/tests/"; then
@@ -279,7 +272,7 @@ jobs:
               echo "Skipping chart ${chart}, no correct SCALE compatibility layer detected"
             fi
           }
-          for train in stable incubator develop non-free deprecated
+          for train in stable incubator
           do
             for chart in master/charts/${train}/*; do
               removetask "${train}" "${chart}" &
@@ -295,7 +288,7 @@ jobs:
               cd -
             fi
           }
-          for train in stable incubator develop non-free deprecated
+          for train in stable incubator
           do
             for chart in master/charts/${train}/*; do
               fetchtask "${chart}"
@@ -320,7 +313,7 @@ jobs:
               echo "Skipping chart $1, no correct SCALE compatibility layer detected"
             fi
           }
-          for train in stable incubator develop non-free deprecated
+          for train in stable incubator
           do
             for chart in master/charts/${train}/*; do
               patchtask "${chart}" &
@@ -341,7 +334,7 @@ jobs:
               echo "Skipping, chart $1 does not contain SCALE compatibility layer..."
             fi
           }
-          for train in stable incubator develop non-free deprecated
+          for train in stable incubator
           do
             for chart in master/charts/${train}/*; do
               addtask "${chart}" &

.github/workflows/community.invalid-template.yaml

@@ -1,21 +0,0 @@
----
-
-name: 'Community: Invalid Template'
-
-on:
-  issues:
-    types: [labeled, unlabeled, reopened]
-
-jobs:
-  support:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: dessant/support-requests@v2
-      with:
-        github-token: ${{ secrets.BOT_TOKEN }}
-        support-label: 'invalid:template-incomplete'
-        issue-comment: >
-          :wave: @{issue-author}, please follow the template provided.
-        close-issue: true
-        lock-issue: true
-        issue-lock-reason: 'resolved'

.github/workflows/housekeeping.yaml

@@ -71,7 +71,7 @@ jobs:
 
       - name: update versions in docs
         run: |
-          for train in stable incubator develop non-free deprecated; do
+          for train in stable incubator; do
             for chart in charts/${train}/*; do
               if [ -d "${chart}" ]; then
                   maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
@@ -105,9 +105,6 @@ jobs:
             changed:
             - 'charts/stable/**'
             - 'charts/incubator/**'
-            - 'charts/develop/**'
-            - 'charts/deprecated/**'
-            - 'charts/non-free/**'
             - 'charts/library/**'
 
       - name: Filter filter-output
@@ -126,14 +123,10 @@ jobs:
                 train="stable"
               elif test -f "./charts/incubator/${chart}/Chart.yaml"; then
                 train="incubator"
-              elif test -f "./charts/deprecated/${chart}/Chart.yaml"; then
-                train="deprecated"
-              elif test -f "./charts/non-free/${chart}/Chart.yaml"; then
-                train="non-free"
               elif test -f "./charts/library/${chart}/Chart.yaml"; then
                 train="library"
               else
-                train="develop"
+                train="incubator"
               fi
               echo "Comparing versions for ${train}/${chart}"
               echo "Bumping patch version for ${train}/${chart}"
@@ -142,7 +135,7 @@ jobs:
 
       - name: update versions in docs
         run: |
-          for train in stable incubator develop non-free deprecated; do
+          for train in stable incubator; do
             for chart in charts/${train}/*; do
               if [ -d "${chart}" ]; then
                   maxchartversion=$(cat ${chart}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
@@ -188,7 +181,7 @@ jobs:
 
       - name: Copy Apps readme to website
         run: |
-          for train in stable incubator develop non-free deprecated; do
+          for train in stable incubator; do
             for chart in charts/${train}/*; do
               if [ -d "${chart}" ]; then
                   chartname=$(basename ${chart})