CI: Helm v3 requires unit in timeout parameter. More CT fixes.

Signed-off-by: Dinko Korunic <[email protected]>

Author: dkorunic

.circleci/ct.yaml

@@ -1,4 +1,4 @@
 remote: k8s
 target-branch: master
 chart-dirs: .
-helm-extra-args: --timeout 600
+helm-extra-args: --timeout 600s

.circleci/install_charts.sh

@@ -20,11 +20,11 @@ create_ct_container() {
 
 cleanup() {
     echo "Removing ct container"
-    docker kill ct > /dev/null 2>&1
+    docker kill ct >/dev/null 2>&1 || true
 }
 
 docker_exec() {
-    docker exec --interactive ct "$@"
+    docker exec --interactive --tty ct "$@"
 }
 
 create_kind_cluster() {
@@ -62,7 +62,7 @@ main() {
 
     echo "Testing for chart repo changes"
     local changed
-    changed=$(docker_exec ct list-changed)
+    changed=$(docker_exec ct list-changed 2>/dev/null | grep -v "is not a valid chart directory")
     if [[ -z "${changed}" ]]; then
         echo "No chart changes detected"
         return

.circleci/release.sh

@@ -16,7 +16,7 @@ readonly CHARTS_URL=https://haproxytech.github.io/helm-charts
 readonly REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel)}"
 
 find_latest_tag() {
-    if ! git describe --tags --abbrev=0 2> /dev/null; then
+    if ! git describe --tags --abbrev=0 2>/dev/null; then
         git rev-list --max-parents=0 --first-parent HEAD
     fi
 }
@@ -47,7 +47,7 @@ update_index() {
 }
 
 main() {
-    pushd "${REPO_ROOT}" > /dev/null
+    pushd "${REPO_ROOT}" >/dev/null
 
     echo "Fetching tags"
     git fetch --tags
@@ -90,7 +90,7 @@ main() {
         echo "Nothing to do. No chart changes detected."
     fi
 
-    popd > /dev/null
+    popd >/dev/null
 }
 
 main