tweak e2e install process

rancher · Jan 7, 2025 · a4f6c5f · a4f6c5f
1 parent 383bf1c
commit a4f6c5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh b/.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh
@@ -10,11 +10,11 @@ source "$(pwd)/scripts/util-team-charts"
 NEWEST_CHART_VERSION=$(newest-chart-version "helm-project-operator")
 fetch-team-chart "helm-project-operator" "$NEWEST_CHART_VERSION"
 LATEST_CHART_PATH="./build/charts/helm-project-operator-${NEWEST_CHART_VERSION}.tgz"
+tar -xvzf "$LATEST_CHART_PATH" -C ./build/charts/
 
 helm upgrade --install --create-namespace -n cattle-helm-system helm-project-operator \
   --set "image.registry='',image.repository=${REPO:-rancher}/helm-project-operator,image.tag=${TAG:-dev}" \
-  "${cluster_args}" \
-  "${RANCHER_HELM_ARGS}" \
-  "${LATEST_CHART_PATH}"
+  "${cluster_args}" "${RANCHER_HELM_ARGS}" \
+  ./build/charts/helm-project-operator
 
 echo "PASS: Helm Project Operator has been installed"
diff --git a/.github/workflows/e2e/scripts/install-federator.sh b/.github/workflows/e2e/scripts/install-federator.sh
@@ -11,12 +11,12 @@ source "$(pwd)/scripts/util-team-charts"
 NEWEST_CHART_VERSION=$(newest-chart-version "prometheus-federator")
 fetch-team-chart "prometheus-federator" "$NEWEST_CHART_VERSION"
 LATEST_CHART_PATH="./build/charts/prometheus-federator-${NEWEST_CHART_VERSION}.tgz"
+tar -xvzf "$LATEST_CHART_PATH" -C ./build/charts/
 
 helm upgrade --install --create-namespace -n cattle-monitoring-system prometheus-federator \
   --set "helmProjectOperator.image.repository=${REPO:-rancher}/prometheus-federator" \
   --set "helmProjectOperator.image.tag=${TAG:-dev}" \
-  "${cluster_args}" \
-  "${RANCHER_HELM_ARGS}" \
-  "${LATEST_CHART_PATH}"
+  "${cluster_args}" "${RANCHER_HELM_ARGS}" \
+  ./build/charts/prometheus-federator
 
 echo "PASS: Prometheus Federator has been installed"