Changed order of installing ChartMuseum

Signed-off-by: Rafa Castelblanque <rcastelblanq@vmware.com>
vmware-tanzu · Aug 25, 2022 · 1a56fd9 · 1a56fd9
1 parent 9c675ce
commit 1a56fd9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/script/chart-museum.sh b/script/chart-museum.sh
@@ -86,6 +86,7 @@ installChartMuseum() {
     --set persistence.enabled=true \
     --set env.secret.BASIC_AUTH_USER=$CHARTMUSEUM_USER \
     --set env.secret.BASIC_AUTH_PASS=$CHARTMUSEUM_PWD
+  info "Waiting for ChartMuseum to be ready..."
   kubectl rollout status -w deployment/chartmuseum --namespace=${CHARTMUSEUM_NS}
 
   echo "Chart museum v${CHARTMUSEUM_VERSION} installed in namespace ${CHARTMUSEUM_NS}"

diff --git a/script/e2e-test.sh b/script/e2e-test.sh
@@ -302,13 +302,16 @@ if [[ -n "${TEST_UPGRADE:-}" ]]; then
   k8s_wait_for_deployment kubeapps kubeapps-ci
 fi
 
-installOrUpgradeKubeapps "${ROOT_DIR}/chart/kubeapps"
-info "Waiting for Kubeapps components to be ready (local chart)..."
-k8s_wait_for_deployment kubeapps kubeapps-ci
+# Install ChartMuseum
 installChartMuseum "${CHARTMUSEUM_VERSION}"
 pushChart apache 8.6.2 admin password
 pushChart apache 8.6.3 admin password
 
+# Install Kubeapps
+installOrUpgradeKubeapps "${ROOT_DIR}/chart/kubeapps"
+info "Waiting for Kubeapps components to be ready (local chart)..."
+k8s_wait_for_deployment kubeapps kubeapps-ci
+
 # Setting up local Docker registry if not in GKE
 if [[ -z "${GKE_BRANCH-}" ]]; then
   setupLocalDockerRegistry