1
0

Merge branch 'master' of https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm into make-views-configurable

This commit is contained in:
sido 2018-07-19 23:17:33 +02:00
commit 586e777f77

View File

@ -229,12 +229,6 @@ jenkins:
Command: cat Command: cat
WorkingDir: /home/jenkins WorkingDir: /home/jenkins
TTY: true TTY: true
node:
Image: "node"
ImageTag: "9.11.2"
Command: cat
WorkingDir: /home/jenkins
TTY: true
EnvVars: EnvVars:
- type: Secret - type: Secret
key: PGP_PASSPHRASE key: PGP_PASSPHRASE
@ -259,6 +253,34 @@ jenkins:
secretName: molgenis-pipeline-env-secret secretName: molgenis-pipeline-env-secret
secretKey: githubToken secretKey: githubToken
NodeSelector: {} NodeSelector: {}
node:
Label: node-carbon
NodeUsageMode: EXCLUSIVE
Containers:
node:
Image: "node"
ImageTag: carbon
Command: cat
WorkingDir: /home/jenkins
TTY: true
alpine:
Image: "spotify/alpine"
Command: cat
WorkingDir: /home/jenkins
TTY: true
EnvVars:
- type: KeyValue
key: npm_config_registry
value: "http://nexus.molgenis-nexus:8081/repository/npm-central/"
- type: Secret
key: CODECOV_TOKEN
secretName: molgenis-pipeline-env-secret
secretKey: codecovToken
- type: Secret
key: GITHUB_TOKEN
secretName: molgenis-pipeline-env-secret
secretKey: githubToken
NodeSelector: {}
molgenis-it: molgenis-it:
InheritFrom: molgenis InheritFrom: molgenis
Label: molgenis-it Label: molgenis-it