pipeline(depls): supports symoblic link for ops-files

removes the restriction on regular files ! close #33
orange-cloudfoundry · Oct 6, 2017 · b1e12f9 · b1e12f9
1 parent a11be21
commit b1e12f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -0,0 +1 @@
+an-operators.yml
diff --git a/spec/tasks/generate_manifest/task_spec.rb b/spec/tasks/generate_manifest/task_spec.rb
@@ -58,15 +58,15 @@
       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
 
     it 'copies operators file to generated_files' do
       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