1
0

7 Commits

3 changed files with 22 additions and 26 deletions

View File

@ -56,29 +56,29 @@ There is one additional group of configuration items specific for this chart, so
New vault token to be used by the pods to retrieve their tokens from the vault. New vault token to be used by the pods to retrieve their tokens from the vault.
| Parameter | Description | Default | | Parameter | Description | Default |
| ---------------------------------- | ------------------------------------------ | ---------------------------------------------- | | ----------------------------------|--------------------------------------------|-----------------------------------------------|
| `PipelineSecrets.Vault.Replace` | Replace the molgenis-pipeline-vault secret | `true` | | `PipelineSecrets.Vault.Replace` | Replace the molgenis-pipeline-vault secret |`true` |
| `PipelineSecrets.Vault.Token` | Token to log into the hashicorp vault | `xxxx` | | `PipelineSecrets.Vault.Token` | Token to log into the hashicorp vault |`xxxx` |
| `PipelineSecrets.Vault.Addr` | Address of the vault | `https:vault-operator.vault-operator.svc:8200` | | `PipelineSecrets.Vault.Addr` | Address of the vault |`https:vault-operator.vault-operator.svc:8200` |
| `PipelineSecrets.Vault.SkipVerify` | Skip verification of the https connection | `1` | | `PipelineSecrets.Vault.skipVerify`| Skip verification of the https connection |`1` |
* Env * Env
Environment variables stored in molgenis-pipeline-env secret, to be added as environment variables Environment variables stored in molgenis-pipeline-env secret, to be added as environment variables
in the slave pods. in the slave pods.
| Parameter | Description | Default | | Parameter | Description | Default |
| --------------------------------------- | ----------------------------------------- | --------------- | | -------------------------------------- | ----------------------------------------- | --------------- |
| `PipelineSecrets.Env.Replace` | Replace molgenis-pipeline-env secret | `true` | | `PipelineSecrets.Env.Replace` | Replace molgenis-pipeline-env secret | `true` |
| `PipelineSecrets.Env.PGPPassphrase` | passphrase for the pgp signing key | `literal:xxxx` | | `PipelineSecrets.Env.PGPPassphrase` | passphrase for the pgp signing key | `literal:xxxx` |
| `PipelineSecrets.Env.CodecovToken` | token for codecov.io | `xxxx` | | `PipelineSecrets.Env.CodecovToken` | token for codecov.io | `xxxx` |
| `PipelineSecrets.Env.GitHubToken` | token for GH molgenis-jenkins user | `xxxx` | | `PipelineSecrets.Env.GitHubToken` | token for GH molgenis-jenkins user | `xxxx` |
| `PipelineSecrets.Env.NexusPassword` | token for molgenis-jenkins user in NEXUS | `xxxx` | | `PipelineSecrets.Env.NexusPassword` | token for molgenis-jenkins user in NEXUS | `xxxx` |
| `PipelineSecrets.Env.DockerHubPassword` | token for molgenis user in hub.docker.com | `xxxx` | | `PipelineSecrets.Env.DockerHubPassword`| token for molgenis user in hub.docker.com | `xxxx` |
| `PipelineSecrets.Env.SonarToken` | token for sonarcloud.io | `xxxx` | | `PipelineSecrets.Env.SonarToken` | token for sonarcloud.io | `xxxx` |
| `PipelineSecrets.Env.NpmToken` | token for npmjs.org | `xxxx` | | `PipelineSecrets.Env.NpmToken` | token for npmjs.org | `xxxx` |
| `PipelineSecrets.Env.SauceAccessKey` | token for saucelabs.com | `xxxx` | | `PipelineSecrets.Env.SauceAccessKey` | token for saucelabs.com | `xxxx` |
* File * File

View File

@ -32,9 +32,6 @@ data:
<buildsDir>${ITEM_ROOTDIR}/builds</buildsDir> <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
<markupFormatter class="hudson.markup.EscapedMarkupFormatter"/> <markupFormatter class="hudson.markup.EscapedMarkupFormatter"/>
<jdks/> <jdks/>
<primaryView>dev</primaryView>
<viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
<myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
<clouds> <clouds>
<org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="kubernetes@{{ template "jenkins.kubernetes-version" . }}"> <org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="kubernetes@{{ template "jenkins.kubernetes-version" . }}">
<name>kubernetes</name> <name>kubernetes</name>
@ -155,8 +152,6 @@ data:
<readTimeout>0</readTimeout> <readTimeout>0</readTimeout>
</org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud> </org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud>
</clouds> </clouds>
<quietPeriod>5</quietPeriod>
<scmCheckoutRetryCount>0</scmCheckoutRetryCount>
<views> <views>
<hudson.model.AllView> <hudson.model.AllView>
<owner class="hudson" reference="../../.."/> <owner class="hudson" reference="../../.."/>
@ -194,6 +189,8 @@ data:
{{- end }} {{- end }}
</views> </views>
<primaryView>{{ .Values.Master.DefaultView }}</primaryView> <primaryView>{{ .Values.Master.DefaultView }}</primaryView>
<quietPeriod>5</quietPeriod>
<scmCheckoutRetryCount>0</scmCheckoutRetryCount>
<slaveAgentPort>50000</slaveAgentPort> <slaveAgentPort>50000</slaveAgentPort>
<disabledAgentProtocols> <disabledAgentProtocols>
{{- range .Values.Master.DisabledAgentProtocols }} {{- range .Values.Master.DisabledAgentProtocols }}

View File

@ -3,17 +3,16 @@ jenkins:
HostName: jenkins.molgenis.org HostName: jenkins.molgenis.org
ServiceType: ClusterIP ServiceType: ClusterIP
InstallPlugins: InstallPlugins:
- kubernetes:1.12.0 - kubernetes:1.12.3
- workflow-aggregator:2.5 - workflow-aggregator:2.5
- workflow-job:2.21 - workflow-job:2.24
- credentials-binding:1.16 - credentials-binding:1.16
- git:3.9.1 - git:3.9.1
- github-branch-source:2.3.6 - github-branch-source:2.3.6
- kubernetes-credentials-provider:0.9 - kubernetes-credentials-provider:0.9
- blueocean:1.6.2 - blueocean:1.8.2
- github-oauth:0.29 - github-oauth:0.29
- gogs-webhook:1.0.14 - gogs-webhook:1.0.14
- sauce-ondemand:1.176
Security: Security:
UseGitHub: false UseGitHub: false
GitHub: GitHub: