diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml index d755a39a..d846f0d5 100644 --- a/.github/workflows/housekeeping.yml +++ b/.github/workflows/housekeeping.yml @@ -371,7 +371,6 @@ jobs: uses: ./.github/workflows/recreate-runners.yml with: verbose: ${{ inputs.verbose == 'true' && 'true' || 'false' }} - deployment_type: 'helm' secrets: TMC_API_TOKEN: ${{ secrets.TMC_API_TOKEN }} GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }} diff --git a/build-app.sh b/build-app.sh index 3497d85c..20d2e8fc 100755 --- a/build-app.sh +++ b/build-app.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) (return 0 2>/dev/null) && sourced=1 || sourced=0 diff --git a/build-core.sh b/build-core.sh index 801f4a64..2f846be0 100755 --- a/build-core.sh +++ b/build-core.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash (return 0 2>/dev/null) && sourced=1 || sourced=0 function check_env() { eval ev='$'$1 diff --git a/config/defaults.json b/config/defaults.json index 33320d41..3977b345 100644 --- a/config/defaults.json +++ b/config/defaults.json @@ -12,9 +12,9 @@ }, "stream_apps_gh_runners": { "pods_per_job": 1, - "ram_per_pod": 6, - "cpu_per_pod": 2, - "machine_type": "n2-standard-8", + "ram_per_pod": 3, + "cpu_per_pod": 1.5, + "machine_type": "e2-highcpu-8", "runner_scaling": "manual", "scale_down": 1, "arc_version": "v0.26.0", diff --git a/create-matrixes.sh b/create-matrixes.sh index a061ccea..2570aa31 100755 --- a/create-matrixes.sh +++ b/create-matrixes.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash pushd applications/processor > /dev/null PROCESSORS=$(find * -maxdepth 0 -type d) popd > /dev/null diff --git a/local/build-images.sh b/local/build-images.sh index 597a5fd4..f11a5448 100755 --- a/local/build-images.sh +++ b/local/build-images.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash java --version if [ $? -eq 0 ] then diff --git a/local/create-containers.sh b/local/create-containers.sh index c7e7c89e..bd5d17db 100755 --- a/local/create-containers.sh +++ b/local/create-containers.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) ROOT_DIR=$(realpath $SCDIR/..) diff --git a/local/download-apps.sh b/local/download-apps.sh index fd2bf742..a1ab7cf5 100755 --- a/local/download-apps.sh +++ b/local/download-apps.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) ROOT_DIR=$(realpath $SCDIR/..) diff --git a/local/pack-containers.sh b/local/pack-containers.sh index 1cb45f17..142b06c8 100755 --- a/local/pack-containers.sh +++ b/local/pack-containers.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) ROOT_DIR=$(realpath $SCDIR/..) diff --git a/mvn-get-version.sh b/mvn-get-version.sh index c99629e1..3f6fa270 100755 --- a/mvn-get-version.sh +++ b/mvn-get-version.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash VERSIONS=$(./mvnw exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q | sed 's/\"//g' | sed 's/version=//g') for v in $VERSIONS; do VERSION=$v diff --git a/publish-app.sh b/publish-app.sh index cba4bf16..e800d91a 100644 --- a/publish-app.sh +++ b/publish-app.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) (return 0 2>/dev/null) && sourced=1 || sourced=0 diff --git a/scripts/add-roles.sh b/scripts/add-roles.sh index f2c15644..c53c2013 100755 --- a/scripts/add-roles.sh +++ b/scripts/add-roles.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash function add_role() { ROLE=$1 ROLE_NAME=$(echo "rolebinding-$NS-default-$ROLE" | sed 's/:/-/g') diff --git a/scripts/check-runners.sh b/scripts/check-runners.sh index e8eef342..8c45e680 100755 --- a/scripts/check-runners.sh +++ b/scripts/check-runners.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/create-cluster-tf-gke.sh b/scripts/create-cluster-tf-gke.sh index 9d861607..8290a68c 100755 --- a/scripts/create-cluster-tf-gke.sh +++ b/scripts/create-cluster-tf-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/create-cluster-tmc.sh b/scripts/create-cluster-tmc.sh index 4ba915b3..d48afb41 100755 --- a/scripts/create-cluster-tmc.sh +++ b/scripts/create-cluster-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash (return 0 2>/dev/null) && sourced=1 || sourced=0 if [ "$sourced" = "0" ]; then echo "This script must be invoked using: source $0 $*" diff --git a/scripts/create-runners-cluster-gke.sh b/scripts/create-runners-cluster-gke.sh index d0dd32f8..e891a8c3 100755 --- a/scripts/create-runners-cluster-gke.sh +++ b/scripts/create-runners-cluster-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/create-runners-cluster-tmc.sh b/scripts/create-runners-cluster-tmc.sh index 4c79eb64..68fb1e0e 100755 --- a/scripts/create-runners-cluster-tmc.sh +++ b/scripts/create-runners-cluster-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/decrease-runners-tmc.sh b/scripts/decrease-runners-tmc.sh index d3b871da..3424fa07 100755 --- a/scripts/decrease-runners-tmc.sh +++ b/scripts/decrease-runners-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/decrease-runners.sh b/scripts/decrease-runners.sh index f58c9b03..de893919 100755 --- a/scripts/decrease-runners.sh +++ b/scripts/decrease-runners.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/delete-cancelled-housekeeping.sh b/scripts/delete-cancelled-housekeeping.sh index 20822399..ffb27a1a 100755 --- a/scripts/delete-cancelled-housekeeping.sh +++ b/scripts/delete-cancelled-housekeeping.sh @@ -1,10 +1,9 @@ -#!/usr/bin/env bash -TO_DEL=$(gh run list --limit 100 -w "housekeeping.yml" --json "conclusion,event,databaseId,name,status,updatedAt" --jq 'map(select(.status == "completed" and .conclusion == "cancelled" and .event == "schedule"))') +#!/bin/bash +TO_DEL=$(gh run list --limit 100 -w "housekeeping.yml" --json "conclusion,event,databaseId,name,status" --jq 'map(select(.status == "completed" and .conclusion == "cancelled" and .event == "schedule"))') if [ "$VERBOSE" != "" ] && [ "$VERBOSE" != "false" ]; then echo "Deleting:$TO_DEL" fi -RUNS=$(gh run list --limit 100 -w "housekeeping.yml" --json "conclusion,event,databaseId,name,status,updatedAt" --jq 'map(select(.status == "completed" and .conclusion == "cancelled" and .event == "schedule")) | .[] | .databaseId' | sed 's/\"//g') - +RUNS=$(echo "$TO_DEL" | jq '.[] | .databaseId' | sed 's/\"//g') for run in $RUNS; do echo "Deleting run $run" gh api --method DELETE -H "Accept: application/vnd.github+json" "/repos/spring-cloud/stream-applications/actions/runs/$run" diff --git a/scripts/delete-cluster-gke.sh b/scripts/delete-cluster-gke.sh index 174dfa77..9904bdce 100755 --- a/scripts/delete-cluster-gke.sh +++ b/scripts/delete-cluster-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/delete-cluster-tf-gke.sh b/scripts/delete-cluster-tf-gke.sh index f0cd2bfc..7af0595b 100755 --- a/scripts/delete-cluster-tf-gke.sh +++ b/scripts/delete-cluster-tf-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/delete-cluster-tmc.sh b/scripts/delete-cluster-tmc.sh index 31c16d8d..22cfd29c 100755 --- a/scripts/delete-cluster-tmc.sh +++ b/scripts/delete-cluster-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash (return 0 2>/dev/null) && sourced=1 || sourced=0 function check_env() { eval ev='$'$1 diff --git a/scripts/delete-failed-housekeeping.sh b/scripts/delete-failed-housekeeping.sh new file mode 100755 index 00000000..37864a3f --- /dev/null +++ b/scripts/delete-failed-housekeeping.sh @@ -0,0 +1,16 @@ +#!/bin/bash +TO_DEL=$(gh run list --limit 100 -w "housekeeping.yml" --json "conclusion,databaseId,name,status" --jq 'map(select(.status == "completed" and .conclusion == "failure"))') +if [ "$VERBOSE" != "" ] && [ "$VERBOSE" != "false" ]; then + echo "Deleting:$TO_DEL" +fi +RUNS=$(echo "$TO_DEL" | jq '.[] | .databaseId' | sed 's/\"//g') +for run in $RUNS; do + echo "Deleting run $run" + gh api --method DELETE -H "Accept: application/vnd.github+json" "/repos/spring-cloud/stream-applications/actions/runs/$run" +done + +RUNS=$(gh run list --limit 100 -w "clean-housekeeping.yml" --json "conclusion,databaseId,status" --jq 'map(select(.status == "completed" and .conclusion == "failure")) | .[] | .databaseId' | sed 's/\"//g') +for run in $RUNS; do + echo "Deleting run $run" + gh api --method DELETE -H "Accept: application/vnd.github+json" "/repos/spring-cloud/stream-applications/actions/runs/$run" +done diff --git a/scripts/delete-k8s-ns.sh b/scripts/delete-k8s-ns.sh index 6f829c12..b3778408 100755 --- a/scripts/delete-k8s-ns.sh +++ b/scripts/delete-k8s-ns.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash WAIT= CARVEL=false NS=default diff --git a/scripts/delete-namespaces.sh b/scripts/delete-namespaces.sh index 91abc18e..0856baf3 100755 --- a/scripts/delete-namespaces.sh +++ b/scripts/delete-namespaces.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/delete-runners-gke.sh b/scripts/delete-runners-gke.sh index 70e92bc6..39aa4b5b 100755 --- a/scripts/delete-runners-gke.sh +++ b/scripts/delete-runners-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/delete-runners-tmc.sh b/scripts/delete-runners-tmc.sh index fcb5814c..6d8e3b8c 100755 --- a/scripts/delete-runners-tmc.sh +++ b/scripts/delete-runners-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/delete-runners.sh b/scripts/delete-runners.sh index 594381d0..5eb67200 100755 --- a/scripts/delete-runners.sh +++ b/scripts/delete-runners.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/delete-secret.sh b/scripts/delete-secret.sh index 7105b7fa..d7b079f5 100755 --- a/scripts/delete-secret.sh +++ b/scripts/delete-secret.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash NS=default if [ "$1" == "" ]; then echo "Arguments: [namespace]" diff --git a/scripts/deploy-gh-runners-gke.sh b/scripts/deploy-gh-runners-gke.sh index db9985f6..b1dea072 100755 --- a/scripts/deploy-gh-runners-gke.sh +++ b/scripts/deploy-gh-runners-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/deploy-gh-runners-tmc.sh b/scripts/deploy-gh-runners-tmc.sh index 7c559924..42f4a569 100755 --- a/scripts/deploy-gh-runners-tmc.sh +++ b/scripts/deploy-gh-runners-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) kubectl create clusterrolebinding actions-runner-privileged-cluster-role-binding \ diff --git a/scripts/deploy-gh-runners.sh b/scripts/deploy-gh-runners.sh index d325d4ad..c367178e 100755 --- a/scripts/deploy-gh-runners.sh +++ b/scripts/deploy-gh-runners.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/determine-default.sh b/scripts/determine-default.sh index d5c1a06d..18fc48fd 100755 --- a/scripts/determine-default.sh +++ b/scripts/determine-default.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/determine-machine-type.sh b/scripts/determine-machine-type.sh index 52f54def..dc405b31 100644 --- a/scripts/determine-machine-type.sh +++ b/scripts/determine-machine-type.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash function check_env() { eval ev='$'$1 if [ "$ev" == "" ]; then diff --git a/scripts/determine-provider.sh b/scripts/determine-provider.sh index 465249fb..cc61662a 100755 --- a/scripts/determine-provider.sh +++ b/scripts/determine-provider.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/ensure-ns.sh b/scripts/ensure-ns.sh index df0e80ff..398b29b0 100755 --- a/scripts/ensure-ns.sh +++ b/scripts/ensure-ns.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash (return 0 2>/dev/null) && sourced=1 || sourced=0 if [ "$1" == "" ]; then echo "Usage: ensure-ns.sh " diff --git a/scripts/increase-runners.sh b/scripts/increase-runners.sh index 0473460c..9f096fa7 100755 --- a/scripts/increase-runners.sh +++ b/scripts/increase-runners.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/is_there_only_one.sh b/scripts/is_there_only_one.sh index a1761a54..7c192941 100755 --- a/scripts/is_there_only_one.sh +++ b/scripts/is_there_only_one.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash if [ "$1" == "" ]; then echo "Expect name of workflow to ignore" exit 1 diff --git a/scripts/k8s/runners-stream-ci-large.yaml b/scripts/k8s/runners-stream-ci-large.yaml index 68a0a2be..62105cb4 100644 --- a/scripts/k8s/runners-stream-ci-large.yaml +++ b/scripts/k8s/runners-stream-ci-large.yaml @@ -18,7 +18,7 @@ spec: resources: requests: cpu: "3000m" - memory: "12Gi" + memory: "4Gi" labels: - stream-ci-large --- diff --git a/scripts/kubeconfig-gke.sh b/scripts/kubeconfig-gke.sh index 81d00024..5544e2c9 100755 --- a/scripts/kubeconfig-gke.sh +++ b/scripts/kubeconfig-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash (return 0 2>/dev/null) && sourced=1 || sourced=0 if (( sourced == 0 )); then echo "This script must be invoked using: source $0 $*" diff --git a/scripts/kubeconfig-runners.sh b/scripts/kubeconfig-runners.sh index d2cf61f8..4e415c7b 100755 --- a/scripts/kubeconfig-runners.sh +++ b/scripts/kubeconfig-runners.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/kubeconfig-tmc.sh b/scripts/kubeconfig-tmc.sh index 41631e1b..86325563 100755 --- a/scripts/kubeconfig-tmc.sh +++ b/scripts/kubeconfig-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash (return 0 2>/dev/null) && sourced=1 || sourced=0 if [ "$sourced" = "0" ]; then echo "This script must be invoked using: source $0 $*" diff --git a/scripts/last-workflow-status.sh b/scripts/last-workflow-status.sh index 79d4da74..3a95bd80 100755 --- a/scripts/last-workflow-status.sh +++ b/scripts/last-workflow-status.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) if [ "$1" = "" ]; then diff --git a/scripts/limit-runners.sh b/scripts/limit-runners.sh index 1cb98365..905d0172 100755 --- a/scripts/limit-runners.sh +++ b/scripts/limit-runners.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/list-clusters-gke.sh b/scripts/list-clusters-gke.sh index f231bd62..cb45d4c3 100755 --- a/scripts/list-clusters-gke.sh +++ b/scripts/list-clusters-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash if [ "$1" = "" ]; then echo "cluster name portion to match must be provided" exit 1 diff --git a/scripts/list-clusters-tmc.sh b/scripts/list-clusters-tmc.sh index f442cd5d..9de44885 100755 --- a/scripts/list-clusters-tmc.sh +++ b/scripts/list-clusters-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash if [ "$1" = "" ]; then echo "cluster name portion to match must be provided" exit 1 diff --git a/scripts/list-last-workflows.sh b/scripts/list-last-workflows.sh index f616abb6..e75d8e1c 100755 --- a/scripts/list-last-workflows.sh +++ b/scripts/list-last-workflows.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash if [ "$1" != "" ]; then WORKFLOWS=("$1") else diff --git a/scripts/list-workflow-runs.sh b/scripts/list-workflow-runs.sh index eb1deca0..29d265b2 100755 --- a/scripts/list-workflow-runs.sh +++ b/scripts/list-workflow-runs.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash if [ "$1" == "" ]; then echo "Provide one or more workflow names like ci.yml that does produce download artefacts" exit 1 diff --git a/scripts/remove-jib-plugin.sh b/scripts/remove-jib-plugin.sh index 7cf1bd5d..119e2414 100755 --- a/scripts/remove-jib-plugin.sh +++ b/scripts/remove-jib-plugin.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(realpath $(dirname "$(readlink -f "${BASH_SOURCE[0]}")" )) if [ "$1" = "" ]; then echo "Usage $0 " diff --git a/scripts/report-pod-changes.sh b/scripts/report-pod-changes.sh index 08e5084c..003a2829 100755 --- a/scripts/report-pod-changes.sh +++ b/scripts/report-pod-changes.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash if [ "$1" != "" ]; then NS="$1" fi diff --git a/scripts/save_gcp_cred_json.sh b/scripts/save_gcp_cred_json.sh index 2d8d2105..5477e4e6 100755 --- a/scripts/save_gcp_cred_json.sh +++ b/scripts/save_gcp_cred_json.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash if [ "$1" == "" ]; then echo "Input required" exit 2 diff --git a/scripts/scale-cluster-nodes.sh b/scripts/scale-cluster-nodes.sh index cfcf514c..093a4888 100755 --- a/scripts/scale-cluster-nodes.sh +++ b/scripts/scale-cluster-nodes.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/scale-cluster-pods.sh b/scripts/scale-cluster-pods.sh index 203f075b..1352c9ee 100755 --- a/scripts/scale-cluster-pods.sh +++ b/scripts/scale-cluster-pods.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/terraform/tf-apply.sh b/scripts/terraform/tf-apply.sh index 99490c8c..a14750a9 100755 --- a/scripts/terraform/tf-apply.sh +++ b/scripts/terraform/tf-apply.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PROJECT_DIR=$(realpath $SCDIR/../..) diff --git a/scripts/terraform/tf-destroy.sh b/scripts/terraform/tf-destroy.sh index dfcced65..9c0f4e7b 100755 --- a/scripts/terraform/tf-destroy.sh +++ b/scripts/terraform/tf-destroy.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/there_can_be_only_one.sh b/scripts/there_can_be_only_one.sh index 055559a0..4d3119e2 100755 --- a/scripts/there_can_be_only_one.sh +++ b/scripts/there_can_be_only_one.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash if [ "$1" == "" ]; then echo "Expect name of workflow to ignore" fi diff --git a/scripts/update-cluster-tf-gke.sh b/scripts/update-cluster-tf-gke.sh index e53226c0..9edc95b6 100755 --- a/scripts/update-cluster-tf-gke.sh +++ b/scripts/update-cluster-tf-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/update-runner-values.sh b/scripts/update-runner-values.sh index ae722809..8a11767a 100755 --- a/scripts/update-runner-values.sh +++ b/scripts/update-runner-values.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) PARENT=$(realpath $SCDIR/..) diff --git a/scripts/use-gke.sh b/scripts/use-gke.sh index 8b38d5df..21610f7a 100755 --- a/scripts/use-gke.sh +++ b/scripts/use-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/use-runners.sh b/scripts/use-runners.sh index 79953f7f..5ca15248 100755 --- a/scripts/use-runners.sh +++ b/scripts/use-runners.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/use-tmc.sh b/scripts/use-tmc.sh index 384e6f17..f09c52f0 100755 --- a/scripts/use-tmc.sh +++ b/scripts/use-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") SCDIR=$(realpath $SCDIR) diff --git a/scripts/wait-deployment.sh b/scripts/wait-deployment.sh index 018d1f73..edab0332 100755 --- a/scripts/wait-deployment.sh +++ b/scripts/wait-deployment.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash set +e if [ "$1" == "" ]; then echo "Deployment name required" diff --git a/scripts/wait-for-cluster-gke.sh b/scripts/wait-for-cluster-gke.sh index 3c63867a..495cf72c 100755 --- a/scripts/wait-for-cluster-gke.sh +++ b/scripts/wait-for-cluster-gke.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash set +e WAIT_NODES=false while [ "$1" != "" ]; do diff --git a/scripts/wait-for-cluster-tmc.sh b/scripts/wait-for-cluster-tmc.sh index b695198d..cd96f5b3 100755 --- a/scripts/wait-for-cluster-tmc.sh +++ b/scripts/wait-for-cluster-tmc.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash set +e if [ "$1" != "" ]; then diff --git a/scripts/wait-k8s.sh b/scripts/wait-k8s.sh index 5231a48a..a65a2663 100755 --- a/scripts/wait-k8s.sh +++ b/scripts/wait-k8s.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash RETRIES=$1 ERR_DIR="/tmp/$(dirname $0)" ERR_FILE="/tmp/$0.err"