diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl index 0bf4325..dd504b8 100644 --- a/molgenis-jenkins/templates/config.tpl +++ b/molgenis-jenkins/templates/config.tpl @@ -34,7 +34,7 @@ data: {{ $podName }} 2147483647 0 - + {{- $local := dict "first" true }} {{- range $key, $value := .NodeSelector }} diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml index cff214b..7d054ad 100644 --- a/molgenis-jenkins/values.yaml +++ b/molgenis-jenkins/values.yaml @@ -10,6 +10,7 @@ jenkins: - git:3.9.1 - github-branch-source:2.3.6 - kubernetes-credentials-provider:0.9 + - blueocean:1.6.1 Jobs: |- molgenis: |- @@ -83,8 +84,8 @@ jenkins: rbac: install: true Pods: - default: - Label: "default" + molgenis: + Label: molgenis NodeUsageMode: NORMAL volumes: - type: HostPath @@ -96,6 +97,7 @@ jenkins: Containers: maven: Image: "registry.webhosting.rug.nl/molgenis/maven" + TTY: true resources: requests: cpu: "1000m" @@ -103,9 +105,11 @@ jenkins: memory: "1Gi" alpine: Image: "spotify/alpine" + TTY: true elasticsearch: Image: "elasticsearch" ImageTag: "5.5.1" + TTY: true Ports: - name: rest containerPort: "9200" @@ -113,6 +117,14 @@ jenkins: - name: api containerPort: "9300" hostPort: "9300" + postgres: + Image: "postgres" + ImageTag: "9.6-alpine" + TTY: true + Ports: + - name: postgres + containerPort: "5432" + hostPort: "5432" EnvVars: - type: Secret key: PGP_PASSPHRASE @@ -121,6 +133,12 @@ jenkins: - type: KeyValue key: PGP_SECRETKEY value: "keyfile:/root/.m2/key.asc" + - type: KeyValue + key: npm_config_registry + value: "http://nexus.molgenis-nexus:8081/repository/npm-central" + - type: KeyValue + key: yarn_proxy + value: "http://nexus.molgenis-nexus:8081/repository/npm-central" - type: Secret key: SONAR_TOKEN secretName: molgenis-pipeline-env-secret @@ -165,7 +183,7 @@ PipelineSecrets: nexus external:* - https://registry.molgenis.org/repository/maven-central/ + http://nexus.molgenis-nexus:8081/repository/maven-central/ @@ -177,7 +195,7 @@ PipelineSecrets: local-nexus - https://registry.molgenis.org/repository/maven-snapshots/ + http://nexus.molgenis-nexus:8081/repository/maven-snapshots/ admin xxxxx