BB-1084 - Clean up small errors / concerns in CI code

.gitlab-ci.yml

@@ -50,7 +50,6 @@ pre vars:
   - echo "CHART_MR_VERSION=$CHART_MR_VERSION" >> variables.env
   - echo "CHART_MA_VERSION=$CHART_MA_VERSION" >> variables.env
   # obtain semver differences (subtract master version from mr verison)
-  - chmod +x ./scripts/semver_diff.sh
   - CHART_VERSION_DIFF=$(./scripts/semver_diff.sh $CHART_MR_VERSION $CHART_MA_VERSION)
   - IFS=. DIFF_ARR=(${CHART_VERSION_DIFF##*-})
   - echo "CHART_VERSION_DIFF=$CHART_VERSION_DIFF" >> variables.env
@@ -75,10 +74,10 @@ pre vars:
     - kubectl get helmrelease -A
 
 .deploy_bigbang: &deploy_bigbang
-  - for script in ./scripts/deploy/*.sh; do chmod +x $script && $script; done
+  - find ./scripts/deploy -type f -name '*.sh' | sort | xargs -r -I {} sh -c 'echo {} && sh {}'
 
 .test_bigbang: &test_bigbang
-  - for test in ./tests/bash/*.sh; do chmod +x $test && $test; done 
+  - find ./tests -type f -name '*.sh' | sort | xargs -r -I {} sh -c 'echo {} && sh {}'
 
 clean install:
   stage: smoke tests
@@ -285,7 +284,7 @@ aws/rke2/bigbang test:
     ## Move this yum install to the dockerfile for the builder
     ## putting it here now for a quick way to install dig
     - yum install bind-utils -y
-    - chmod +x scripts/hosts.sh && ./scripts/hosts.sh
+    - ./scripts/hosts.sh
     - *test_bigbang
 
 # Uninstall BigBang on RKE2 cluster on AWS

.gitlab-ci/jobs/networking/aws/.gitlab-ci.yml

 .calc_unique_cidr: &calc_unique_cidr
   - apk add python3 py3-boto3
   - echo "Calculating unique cidr range for vpc"
-  - chmod 755 ../../../get-vpc.py
   - TF_VAR_vpc_cidr=$(terraform output vpc_cidr | tr -d '\n' | tr -d '\r' | grep 10) || TF_VAR_vpc_cidr=$(python3 ../../../get-vpc.py | tr -d '\n' | tr -d '\r')
   - echo "Using VPC CIDR $TF_VAR_vpc_cidr for $CLUSTER_NAME cluster"
   - export TF_VAR_vpc_cidr=$TF_VAR_vpc_cidr

scripts/deploy/01_deploy_bigbang.sh

-#!/bin/bash
+#!/usr/bin/env bash
+
 set -ex
 
 # Deploy flux and wait for it to be ready

scripts/deploy/02_wait_for_helmrealeases.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

tests/bash/01_virtualservices.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 # exit on error
 set -e

tests/bash/02_non_ironbank.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 # exit on error
 set -e