From b1e12f9bf8d9a87429b1ff22002fa1b2aa484f88 Mon Sep 17 00:00:00 2001 From: Olivier ORAND Date: Fri, 6 Oct 2017 18:21:09 +0200 Subject: [PATCH] pipeline(depls): supports symoblic link for ops-files removes the restriction on regular files ! close #33 --- scripts/manifest/manifest-lifecycle-generation.sh | 2 +- .../additional-resource/template/a-link-to-an-operators.yml | 1 + spec/tasks/generate_manifest/task_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 120000 spec/tasks/generate_manifest/additional-resource/template/a-link-to-an-operators.yml diff --git a/scripts/manifest/manifest-lifecycle-generation.sh b/scripts/manifest/manifest-lifecycle-generation.sh index a26302bb8..9631f01bf 100755 --- a/scripts/manifest/manifest-lifecycle-generation.sh +++ b/scripts/manifest/manifest-lifecycle-generation.sh @@ -6,7 +6,7 @@ OUTPUT_DIR=${OUTPUT_DIR:-${CURRENT_DIR}/generated-files/} COMMON_SCRIPT_DIR=${COMMON_SCRIPT_DIR:-scripts-resource/scripts/manifest} echo "Coping operators files from '${YML_TEMPLATE_DIR}' to '${OUTPUT_DIR}'" -find ${YML_TEMPLATE_DIR} -maxdepth 1 -type f -name "*-operators.yml" -exec cp --verbose {} ${OUTPUT_DIR} \; +find ${YML_TEMPLATE_DIR} -maxdepth 1 -name "*-operators.yml" -exec cp --verbose {} ${OUTPUT_DIR} \; ${COMMON_SCRIPT_DIR}/generate-manifest.sh diff --git a/spec/tasks/generate_manifest/additional-resource/template/a-link-to-an-operators.yml b/spec/tasks/generate_manifest/additional-resource/template/a-link-to-an-operators.yml new file mode 120000 index 000000000..e66bf5c29 --- /dev/null +++ b/spec/tasks/generate_manifest/additional-resource/template/a-link-to-an-operators.yml @@ -0,0 +1 @@ +an-operators.yml \ No newline at end of file diff --git a/spec/tasks/generate_manifest/task_spec.rb b/spec/tasks/generate_manifest/task_spec.rb index 0c8dd8b65..1b32c7208 100644 --- a/spec/tasks/generate_manifest/task_spec.rb +++ b/spec/tasks/generate_manifest/task_spec.rb @@ -58,7 +58,7 @@ tpl_yml_files .map { |filename| File.basename(filename, '-tpl.yml') } .each do |base_filename| expected_filename = File.join(@generated_files, base_filename + '.yml') - expect(File,).to exist(expected_filename) + expect(File).to exist(expected_filename), 'expected ' + base_filename + '.yml' end end @@ -66,7 +66,7 @@ operators_yml_files .map { |filename| File.basename(filename) } .each do |base_filename| expected_filename = File.join(@generated_files, base_filename) - expect(File).to exist(expected_filename), 'expected ' + base_filename + '' + expect(File).to exist(expected_filename), 'expected ' + base_filename + 'to exist' end end