Merge commit '7023d604daedb8a50d7c2ab210bcf94186ed4d84' into production
This commit is contained in:
commit
216ab73a8e
4 changed files with 8 additions and 6 deletions
|
|
@ -1,4 +1,5 @@
|
|||
def comparefiles(importedfile, currentfile, boolean ignorewhitespace = true) {
|
||||
echo "Comparing file: ${importedfile} with: ${currentfile} option: ${ignorewhitespace}"
|
||||
def wsparameter = "-w"
|
||||
if (!ignorewhitespace) {
|
||||
wsparameter = ""
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
def comparefiles(importedjsonfile, currentjsonfile) {
|
||||
echo "Comparing file: ${importedjsonfile} with: ${currentjsonfile}"
|
||||
echo "Comparing json file: ${importedjsonfile} with: ${currentjsonfile}"
|
||||
if (isUnix()) {
|
||||
sh """
|
||||
which jq
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ pipeline {
|
|||
echo("Showing filtered releases")
|
||||
for (release in allreleases) {
|
||||
if (!release.toLowerCase().startsWith("superceded") &&
|
||||
!release.toLowerCase().startsWith("superseded") &&
|
||||
!release.toLowerCase().startsWith("erroneous") &&
|
||||
!release.toLowerCase().startsWith("faulty") &&
|
||||
!release.toLowerCase().startsWith("ignore") &&
|
||||
|
|
|
|||
|
|
@ -196,8 +196,8 @@ def docheckout(String gitURL, String revision, int cloneDepth, String reporootpa
|
|||
],
|
||||
doGenerateSubmoduleConfigurations: false,
|
||||
extensions: [
|
||||
[$class: 'GitLFSPull'],
|
||||
[$class: 'CleanBeforeCheckout'],
|
||||
[$class: 'GitLFSPull',timeout: 25],
|
||||
[$class: 'CleanBeforeCheckout',timeout: 20],
|
||||
[$class: 'CloneOption', depth: cloneDepth, noTags: false, reference: reporootpath, shallow: shallowClone, timeout: 120],
|
||||
[$class: 'CheckoutOption', timeout: 120],
|
||||
[$class: 'RelativeTargetDirectory', relativeTargetDir: targetDir],
|
||||
|
|
@ -265,9 +265,9 @@ def gitsparserestore(String targetDir) {
|
|||
"""
|
||||
} else {
|
||||
powershell """
|
||||
git rm -rf . 2> nul
|
||||
git clean -fxd 2> nul
|
||||
git reset --hard 2> nul
|
||||
git rm -rf . > \$null
|
||||
git clean -fxd > \$null
|
||||
git reset --hard > \$null
|
||||
"""
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue