From 6a77c1e688841132b1a14f9e306980e26e6e505b Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 25 Jul 2018 08:45:37 +0200 Subject: [PATCH 1/3] added sonar token --- molgenis-jenkins/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml index 68762ef..59eef0a 100644 --- a/molgenis-jenkins/values.yaml +++ b/molgenis-jenkins/values.yaml @@ -279,6 +279,10 @@ jenkins: key: GITHUB_TOKEN secretName: molgenis-pipeline-env-secret secretKey: githubToken + - type: Secret + key: NPM_TOKEN + secretName: molgenis-pipeline-env-secret + secretKey: npmToken NodeSelector: {} molgenis-it: InheritFrom: molgenis @@ -356,6 +360,8 @@ PipelineSecrets: GogsToken: xxxx # Token for sonarcloud.io SonarToken: xxxx + # Token for npmjs.org + NpmToken: xxxx # Password Local NEXUS NexusPassword: xxxx # Password hub.docker.com From 59e42a304848585bea5fb9b1b6b021a62d8ecd24 Mon Sep 17 00:00:00 2001 From: sido Date: Wed, 1 Aug 2018 22:36:02 +0200 Subject: [PATCH 2/3] updated node container and removed alpine containers --- molgenis-jenkins/values.yaml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml index 59eef0a..582c173 100644 --- a/molgenis-jenkins/values.yaml +++ b/molgenis-jenkins/values.yaml @@ -216,6 +216,8 @@ jenkins: Containers: maven: Image: "registry.webhosting.rug.nl/molgenis/maven" + ImageTag: lts + AlwaysPullImage: true Command: cat WorkingDir: /home/jenkins TTY: true @@ -223,11 +225,6 @@ jenkins: requests: cpu: "1" memory: "4Gi" - alpine: - Image: "spotify/alpine" - Command: cat - WorkingDir: /home/jenkins - TTY: true EnvVars: - type: Secret key: PGP_PASSPHRASE @@ -257,13 +254,9 @@ jenkins: NodeUsageMode: EXCLUSIVE Containers: node: - Image: "node" - ImageTag: carbon - Command: cat - WorkingDir: /home/jenkins - TTY: true - alpine: - Image: "spotify/alpine" + Image: "registry.webhosting.rug.nl/molgenis/node" + ImageTag: lts + AlwaysPullImage: true Command: cat WorkingDir: /home/jenkins TTY: true From 1215e3edbe720ac6a4352691483d2b4edb3780ad Mon Sep 17 00:00:00 2001 From: sido Date: Mon, 6 Aug 2018 20:40:51 +0200 Subject: [PATCH 3/3] added alpine container --- molgenis-jenkins/values.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml index c60a64b..875b9c1 100644 --- a/molgenis-jenkins/values.yaml +++ b/molgenis-jenkins/values.yaml @@ -389,6 +389,11 @@ jenkins: requests: cpu: "1" memory: "4Gi" + alpine: + Image: "spotify/alpine" + Command: cat + WorkingDir: /home/jenkins + TTY: true EnvVars: - type: Secret key: PGP_PASSPHRASE