Skip to content

Commit

Permalink
New version
Browse files Browse the repository at this point in the history
  • Loading branch information
alexpenev-s authored and dzahariev committed Jan 7, 2020
1 parent 0f049b8 commit 133ff0f
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 27 deletions.
17 changes: 4 additions & 13 deletions .pipeline/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,7 @@ steps:
containerBuildOptions: '--no-push --skip-tls-verify-pull'
containerCommand: '/busybox/tail -f /dev/null'
containerShell: '/busybox/sh'
#workaround for https://github.com/GoogleContainerTools/kaniko/issues/645
#dockerImage: 'gcr.io/kaniko-project/executor:debug-v0.9.0'
dockerImage: docker.wdf.sap.corp:50000/piper/kaniko:latest
dockerImage: 'gcr.io/kaniko-project/executor:debug'
dockerOptions: "-u 0 --entrypoint=''"
executeCheckmarxScan:
checkmarxServerUrl: 'https://cx.wdf.sap.corp:443'
Expand Down Expand Up @@ -488,9 +486,9 @@ steps:
buildDescriptorFile: './sbtDescriptor.json'
dockerImage: 'docker.wdf.sap.corp:50000/piper/sbt'
executeVulasScan:
serverUrl: 'https://vulas.c.eu-de-2.cloud.sap'
serverUrl: 'https://vulas.tools.sap'
backendEndpoint: '/backend'
svmServerUrl: 'https://svmprodw8563e4f1.int.sap.hana.ondemand.com'
svmServerUrl: 'https://svmprodzdohvhnx0v.int.sap.eu2.hana.ondemand.com'
svmEndpoint: '/SVM/services'
svmExemptionFileName: 'vulas-exemptionsFromSvm.properties'
space:
Expand Down Expand Up @@ -649,9 +647,6 @@ steps:
customTlsCertificateLinks:
- http://aia.pki.co.sap.com/aia/SAPNetCA_G2.crt
- http://aia.pki.co.sap.com/aia/SAP%20Global%20Root%20CA.crt
#workaround for https://github.com/GoogleContainerTools/kaniko/issues/645
#dockerImage: 'gcr.io/kaniko-project/executor:debug-v0.9.0'
dockerImage: docker.wdf.sap.corp:50000/piper/kaniko:latest
manageCloudFoundryEnvironment:
cfCredentialsId: 'CF_CREDENTIAL'
command: 'setup-environment -y ${config.environmentDescriptorFile}'
Expand All @@ -672,6 +667,7 @@ steps:
xsSecurityFile: 'xs-security.json'
mtaBuild:
globalSettingsFile: 'https://nexusmil.wdf.sap.corp:8443/nexus/service/local/templates/settings/LeanDI/content'
mtaBuildTool: 'cloudMbt'
publishCheckResults:
archive: false
aggregation:
Expand Down Expand Up @@ -1123,10 +1119,6 @@ steps:
dockerCommand: 'mvn --batch-mode clean verify'
dockerImage: 'docker.wdf.sap.corp:50000/piper/maven'
dockerWorkspace: '/home/piper'
mta:
dockerCommand: 'java -jar /usr/lib/mta-cli/mta-cli.jar --build-target CF build'
dockerImage: 'docker.wdf.sap.corp:50000/piper/mta'
dockerWorkspace: '/home/piper'
npm:
dockerCommand: 'npm install && npm test'
dockerImage: 'docker.wdf.sap.corp:50000/piper/node'
Expand All @@ -1135,4 +1127,3 @@ steps:
dockerCommand: 'sbt clean assembly'
dockerImage: 'docker.wdf.sap.corp:50000/piper/sbt'
dockerWorkspace: '/home/piper'
useCloudMbt: false
39 changes: 25 additions & 14 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 133ff0f

Please sign in to comment.