From 79fd9dc4aa435bce2441ad0e8735193dd6ed71a6 Mon Sep 17 00:00:00 2001 From: Olivier ORAND Date: Wed, 27 Nov 2024 15:23:32 +0000 Subject: [PATCH] task(cf-push|[pre|post]_deploy): force bash usage --- concourse/tasks/post_deploy/run.sh | 2 +- concourse/tasks/pre_deploy/run.sh | 2 +- scripts/cf/push.sh | 2 +- spec/tasks/all_tasks_spec.rb | 2 +- spec/tasks/apply_iaas_type_and_profiles/task_spec.rb | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/concourse/tasks/post_deploy/run.sh b/concourse/tasks/post_deploy/run.sh index 0170e7daa..c94917fd0 100755 --- a/concourse/tasks/post_deploy/run.sh +++ b/concourse/tasks/post_deploy/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e CURRENT_DIR=$(pwd) diff --git a/concourse/tasks/pre_deploy/run.sh b/concourse/tasks/pre_deploy/run.sh index c90af62c9..a65f05148 100755 --- a/concourse/tasks/pre_deploy/run.sh +++ b/concourse/tasks/pre_deploy/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/scripts/cf/push.sh b/scripts/cf/push.sh index 8a169c2c6..2ea974128 100755 --- a/scripts/cf/push.sh +++ b/scripts/cf/push.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e set -o pipefail diff --git a/spec/tasks/all_tasks_spec.rb b/spec/tasks/all_tasks_spec.rb index 918f1cd4f..9c8e633da 100644 --- a/spec/tasks/all_tasks_spec.rb +++ b/spec/tasks/all_tasks_spec.rb @@ -34,7 +34,7 @@ TaskSpecHelper.curl_image + ':' + TaskSpecHelper.curl_image_version, TaskSpecHelper.git_image + ':' + TaskSpecHelper.git_image_version, TaskSpecHelper.bosh_cli_v2_image + ':' + TaskSpecHelper.bosh_cli_v2_image_version, - TaskSpecHelper.cf_cli_image + ':' + TaskSpecHelper.cf_cli_image_version, + #TaskSpecHelper.cf_cli_image + ':' + TaskSpecHelper.cf_cli_image_version, TaskSpecHelper.spruce_image + ':' + TaskSpecHelper.spruce_image_version, TaskSpecHelper.ruby_image + ':' + TaskSpecHelper.ruby_image_version, TaskSpecHelper.ruby_image + ':' + TaskSpecHelper.ruby_slim_image_version, diff --git a/spec/tasks/apply_iaas_type_and_profiles/task_spec.rb b/spec/tasks/apply_iaas_type_and_profiles/task_spec.rb index ddc07297a..92ebe93a4 100644 --- a/spec/tasks/apply_iaas_type_and_profiles/task_spec.rb +++ b/spec/tasks/apply_iaas_type_and_profiles/task_spec.rb @@ -19,6 +19,7 @@ Dir.chdir(@templates_dir) do `git init .` + `git branch -m main` `git add .` `git commit -a -m"initial commit"` %w[commit_message commit_timestamp committer describe_ref ref short_ref].each do |filename|