[GitHub Actions] Fix install xsltproc

.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 }}

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

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

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",

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

local/build-images.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 java --version
 if [ $? -eq 0 ]
 then

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/..)

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/..)

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/..)

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

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

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')

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/..)

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)
 

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 $*"

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)
 

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/..)

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)
 

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/..)

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"

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)
 

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)
 

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

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

scripts/delete-k8s-ns.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 WAIT=
 CARVEL=false
 NS=default

scripts/delete-namespaces.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 SCDIR=$(realpath $SCDIR)
 

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)
 

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)
 

scripts/delete-runners.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 SCDIR=$(realpath $SCDIR)
 

scripts/delete-secret.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 NS=default
 if [ "$1" == "" ]; then
   echo "Arguments: <secret-name> [namespace]"

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)
 

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 \

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/..)

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/..)

scripts/determine-machine-type.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 function check_env() {
     eval ev='$'$1
     if [ "$ev" == "" ]; then

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/..)

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 <namespace>"

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/..)

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

scripts/k8s/runners-stream-ci-large.yaml

@@ -18,7 +18,7 @@ spec:
       resources:
         requests:
           cpu: "3000m"
-          memory: "12Gi"
+          memory: "4Gi"
       labels:
         - stream-ci-large
 ---

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 $*"

scripts/kubeconfig-runners.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 SCDIR=$(realpath $SCDIR)
 

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 $*"

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

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/..)

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

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

scripts/list-last-workflows.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 if [ "$1" != "" ]; then
   WORKFLOWS=("$1")
 else

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

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 <pom-file>"

scripts/report-pod-changes.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 if [ "$1" != "" ]; then
   NS="$1"
 fi

scripts/save_gcp_cred_json.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 if [ "$1" == "" ]; then
   echo "Input required"
   exit 2

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/..)

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/..)

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/../..)

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)
 

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

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)
 

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/..)

scripts/use-gke.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 SCDIR=$(realpath $SCDIR)
 

scripts/use-runners.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 SCDIR=$(realpath $SCDIR)
 

scripts/use-tmc.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 SCDIR=$(realpath $SCDIR)
 

scripts/wait-deployment.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set +e
 if [ "$1" == "" ]; then
   echo "Deployment name required"

scripts/wait-for-cluster-gke.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set +e
 WAIT_NODES=false
 while [ "$1" != "" ]; do

scripts/wait-for-cluster-tmc.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set +e
 
 if [ "$1" != "" ]; then

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"