commit f64a3a6b661f60028f49d5401e5fd3f3cbbe7fc6
author Zack Williams <zdw@opennetworking.org> Mon Nov 04 19:17:42 2019 +0000
committer Gerrit Code Review <gerrit@opencord.org> Mon Nov 04 19:17:42 2019 +0000
tree 17a280a8d54e40812ab21a2af9f6be78b2e59301
parent b28a02ef58c3aec0c2ae0c1dfcac9f0faf3b49a8
parent f2ec899a576407d82d087a83257cc0a139faa746

Merge "Disable Synopsys/BlackDuck checks, un-trigger FOSSA job"

jjb/shell/tagcollisionreject.sh

diff --git a/jjb/shell/tagcollisionreject.sh b/jjb/shell/tagcollisionreject.sh
index 309e35c..a7ba04e 100755
--- a/jjb/shell/tagcollisionreject.sh
+++ b/jjb/shell/tagcollisionreject.sh
@@ -140,7 +140,7 @@
 
     done
 
-  done  < <( find "${WORKSPACE}" -name 'Dockerfile*' ! -path "*/vendor/*" -print0 )
+  done  < <( find "${WORKSPACE}" -name 'Dockerfile*' ! -path "*/vendor/*" ! -name "*dockerignore" -print0 )
 }
 
 echo "Checking git repo with remotes:"

jjb/shell/versiontag.sh

diff --git a/jjb/shell/versiontag.sh b/jjb/shell/versiontag.sh
index cc01f97..41971ce 100755
--- a/jjb/shell/versiontag.sh
+++ b/jjb/shell/versiontag.sh
@@ -141,7 +141,7 @@
 
     done
 
-  done  < <( find "${WORKSPACE}" -name 'Dockerfile*' ! -path "*/vendor/*" -print0 )
+  done  < <( find "${WORKSPACE}" -name 'Dockerfile*' ! -path "*/vendor/*" ! -name "*dockerignore" -print0 )
 }