ci(fix): shellcheck fix

RedHatInsights · Sep 21, 2023 · 1c4bca7 · 1c4bca7
1 parent 4f05207
commit 1c4bca7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/build_deploy.sh b/build_deploy.sh
@@ -2,13 +2,14 @@
 
 set -exv
 
-CICD_TOOLS_REPO_BRANCH='add-build-helper-tools'
-CICD_TOOLS_REPO_ORG='Victoremepunto'
+export CICD_TOOLS_REPO_BRANCH='add-build-helper-tools'
+export CICD_TOOLS_REPO_ORG='Victoremepunto'
 CICD_TOOLS_URL="https://raw.githubusercontent.com/${CICD_TOOLS_REPO_ORG}/cicd-tools/${CICD_TOOLS_REPO_BRANCH}/src/bootstrap.sh"
+# shellcheck source=/dev/null
 source <(curl -sSL "$CICD_TOOLS_URL") image_builder
 
-IMAGE_NAME='quay.io/cloudservices/compliance-backend'
-ADDITIONAL_TAGS="latest"
-BUILD_ARGS=("IMAGE_TAG=$(cicd_tools::image_builder::get_image_tag)")
+export IMAGE_NAME='quay.io/cloudservices/compliance-backend'
+export ADDITIONAL_TAGS="latest"
+export BUILD_ARGS=("IMAGE_TAG=$(cicd_tools::image_builder::get_image_tag)")
 
 cicd_tools::image_builder::build_and_push
diff --git a/scripts/unit_test.sh b/scripts/unit_test.sh
@@ -4,6 +4,7 @@
 CICD_TOOLS_REPO_BRANCH='add-build-helper-tools'
 CICD_TOOLS_REPO_ORG='Victoremepunto'
 CICD_TOOLS_URL="https://raw.githubusercontent.com/${CICD_TOOLS_REPO_ORG}/cicd-tools/${CICD_TOOLS_REPO_BRANCH}/src/bootstrap.sh"
+# shellcheck source=/dev/null
 source <(curl -sSL "$CICD_TOOLS_URL") image_builder
 
 if ! cicd_tools::image_builder::is_change_request_context; then
@@ -31,7 +32,7 @@ DATABASE_NAME="compliance-test"
 teardown() {
 
   for id in "$DB_CONTAINER_ID" "$TEST_CONTAINER_ID" "$COMPLIANCE_POD_ID"; do
-    cicd_tools::container::cmd rm -f "$id"
+    cicd_tools::container::cmd rm -f "$id" || echo "couldn't delete container ID: $id"
   done
 }