From c198794d7ffa16d52b033cf9b53eb8cd7f648fe7 Mon Sep 17 00:00:00 2001
From: tompizmor <tompizmor@gmail.com>
Date: Wed, 11 Apr 2018 17:58:25 +0200
Subject: [PATCH] Publish charts for several branches

---
 .circleci/config.yml | 13 +++++++++----
 README.md            | 14 +++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bc9f3686c..40324b432 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,13 +22,18 @@ jobs:
       - run:
           name: Package charts
           command: |
-            curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/helm-package-charts.sh | bash -
+            curl -sL https://raw.githubusercontent.com/tompizmor/test-infra/chart_repo_branches/circle/helm-package-charts.sh | bash -
       - deploy:
           name: Publish charts
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/helm-publish-charts.sh | bash -
-            fi
+            case ${CIRCLE_BRANCH} in
+              "master" | "azure" )
+                curl -sL https://raw.githubusercontent.com/tompizmor/test-infra/chart_repo_branches/circle/helm-publish-charts.sh | bash -
+                ;;
+              * )
+                echo "Skipping chart publishing for ${CIRCLE_BRANCH} branch"
+                ;;
+            esac
 
 workflows:
   version: 2
diff --git a/README.md b/README.md
index f7629ca3e..bf27d8413 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,11 @@ Popular applications, provided by [Bitnami](https://bitnami.com), ready to launc
 ## TL;DR
 
 ```bash
-$ helm repo add bitnami-incubator https://charts.bitnami.com/incubator
-$ helm search bitnami-incubator
+$ helm repo add bitnami https://charts.bitnami.com/bitnami
+$ helm search bitnami
 ```
 
-## Stable charts (contributed to [kubernetes/charts](https://github.com/kubernetes/charts))
+## Upstreamed charts (contributed to [kubernetes/charts](https://github.com/kubernetes/charts))
 
 - [Dokuwiki](https://github.com/kubernetes/charts/tree/master/stable/dokuwiki)
 - [Drupal](https://github.com/kubernetes/charts/tree/master/stable/drupal)
@@ -38,13 +38,13 @@ $ helm search bitnami-incubator
 - [TestLink](https://github.com/kubernetes/charts/tree/master/stable/testlink)
 - [WordPress](https://github.com/kubernetes/charts/tree/master/stable/wordpress)
 
-## Incubator charts
+## Bitnami charts
 
 - [Apache](https://github.com/bitnami/charts/tree/master/incubator/apache)
 - [Elasticsearch](https://github.com/bitnami/charts/tree/master/incubator/elasticsearch)
-- [JasperReports Server](https://github.com/kubernetes/charts/tree/master/stable/jasperreports)
 - [Jenkins](https://github.com/bitnami/charts/tree/master/incubator/jenkins)
 - [MariaDB Cluster](https://github.com/bitnami/charts/tree/master/incubator/mariadb-cluster)
+- [Mean](https://github.com/bitnami/charts/tree/master/incubator/mean)
 - [Memcached](https://github.com/bitnami/charts/tree/master/incubator/memcached)
 - [MySQL](https://github.com/bitnami/charts/tree/master/incubator/mysql)
 - [nginx](https://github.com/bitnami/charts/tree/master/incubator/nginx)
@@ -78,10 +78,10 @@ To install Helm, refer to the [Helm install guide](https://github.com/kubernetes
 
 ### Add Repo
 
-The stable charts are contributed to the upstream [kubernetes/charts](https://github.com/kubernetes/charts) repository. The following command allows you to download and install the incubator charts from this repository.
+The stable charts are contributed to the upstream [kubernetes/charts](https://github.com/kubernetes/charts) repository. The following command allows you to download and install all the charts from this repository, the bitnami and the upstreamed ones.
 
 ```bash
-$ helm repo add bitnami-incubator https://charts.bitnami.com/incubator
+$ helm repo add bitnami https://charts.bitnami.com/bitnami
 ```
 
 ### Using Helm