Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🗑️ Codacy markdown issues #848

Merged
merged 2 commits into from
Apr 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.

pulls:
markComment: >
This pull request has been automatically marked as stale because it has not had
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ mvn hpi:run

```text
...
...
INFO: Jenkins is fully up and running
```

Expand Down
3 changes: 0 additions & 3 deletions demos/alauda-devops-sync/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ Alauda DevOps Sync plugin configuration belongs under `unclassified` root elemen
## sample configuration

```yaml
jenkins:
[...]
unclassified:
[...]
alaudaSync:
enabled: true
jenkinsService: jenkins
Expand Down
7 changes: 2 additions & 5 deletions demos/artifactory/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@ Artifactory plugin configuration belongs under `unclassified` root element
## sample configuration

```yaml
jenkins:
[...]
unclassified:
[...]
artifactorybuilder:
useCredentialsPlugin: true
artifactoryServers:
- serverId: artifactory
artifactoryUrl: http://acme.com/artifactory
deployerCredentialsConfig:
credentialsId: 'artifactory'
credentialsId: "artifactory"
resolverCredentialsConfig:
username: artifactory_user
password: ${ARTIFACTORY_PASSWORD}
Expand All @@ -25,4 +22,4 @@ unclassified:

Currently setting credentials causes ERROR & `Enable Push to Bintray` is not supported (always enabled).

see [https://www.jfrog.com/jira/browse/HAP-1018]
see [jfrog/HAP-1018](https://www.jfrog.com/jira/browse/HAP-1018)
1 change: 0 additions & 1 deletion demos/build_agents/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Build agents configuration belongs (currently) under `jenkins` root element

```yaml
jenkins:
(...)
nodes:
- permanent:
labelString: "linux docker test"
Expand Down
2 changes: 0 additions & 2 deletions demos/credentials/credentials.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
jenkins:
systemMessage: "Example of configuring credentials in Jenkins"

[..]

credentials:
system:
domainCredentials:
Expand Down
2 changes: 1 addition & 1 deletion demos/ec2/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# configure Amazon EC2 plugin

https://wiki.jenkins.io/display/JENKINS/Amazon+EC2+Plugin
[Amazon EC2 Plugin](https://wiki.jenkins.io/display/JENKINS/Amazon+EC2+Plugin)

## sample configuration

Expand Down
2 changes: 1 addition & 1 deletion demos/jenkins/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ jenkins:
numExecutors: 1 # This is just a random example entry to show that there is no "end token" for the multiline string apart from un-indent to the next YAML property.
```

# implementation note
## implementation note

The example above is only a subset of commonly used settings. The full list is available in the generated documentation.
11 changes: 4 additions & 7 deletions demos/jenkins/jenkins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jenkins:
numExecutors: 5
scmCheckoutRetryCount: 2
mode: NORMAL

globalNodeProperties:
- envVars:
env:
Expand Down Expand Up @@ -36,20 +36,17 @@ jenkins:
user: "jenkins"
instanceCapStr: "10"



tool:
git:
installations:
- name: git
home: /usr/local/bin/git

security:
remotingCLI:
enabled: false
remotingCLI:
enabled: false

unclassified:

artifactorybuilder:
useCredentialsPlugin: true
artifactoryServers:
Expand All @@ -59,7 +56,7 @@ unclassified:
resolverCredentialsConfig:
username: artifactory_user
password: ${ARTIFACTORY_PASSWORD}

globalLibraries:
libraries:
- name: "awesome-lib"
Expand Down
18 changes: 9 additions & 9 deletions demos/jobs/bitbucket.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
organizationFolder('Bitbucket Organization Folder') {
description("Bitbucket orga folder configured with JCasC")
displayName('My Project')

// "Projects"
organizations {
bitbucket {
Expand All @@ -15,11 +15,11 @@ jobs:
repoOwner("OWN")
credentialsId("bitbucket-http")

// "Traits" ("Behaviours" in the GUI) that are "declarative-compatible"
traits {
// "Traits" ("Behaviours" in the GUI) that are "declarative-compatible"
traits {
webhookRegistrationTrait {
mode('ITEM')
}
}
submoduleOptionTrait {
extension {
disableSubmodules(false)
Expand All @@ -35,20 +35,20 @@ jobs:

}

// "Traits" ("Behaviours" in the GUI) that are NOT "declarative-compatible"
// "Traits" ("Behaviours" in the GUI) that are NOT "declarative-compatible"
// For some 'traits, we need to configure this stuff by hand until JobDSL handles it
// https://issues.jenkins.io/browse/JENKINS-45504
configure { node ->
def traits = node / navigators / 'com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMNavigator' / traits
traits << 'com.cloudbees.jenkins.plugins.bitbucket.BranchDiscoveryTrait' {
strategyId('3')
strategyId('3')
}
traits << 'com.cloudbees.jenkins.plugins.bitbucket.SSHCheckoutTrait' {
credentialsId('bitbucket-ssh')
credentialsId('bitbucket-ssh')
}

}
}

// "Project Recognizers"
projectFactories {
workflowMultiBranchProjectFactory {
Expand Down
34 changes: 17 additions & 17 deletions demos/jobs/multibranch-github.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
jobs:
- script: >
multibranchPipelineJob('image-jenkins') {
branchSources {
github {
scanCredentialsId('github')
repoOwner('my-org')
repository('my-repository')
}
}
orphanedItemStrategy {
discardOldItems {
numToKeep(1)
}
}
triggers {
periodic(5)
}
}
multibranchPipelineJob('image-jenkins') {
branchSources {
github {
scanCredentialsId('github')
repoOwner('my-org')
repository('my-repository')
}
}
orphanedItemStrategy {
discardOldItems {
numToKeep(1)
}
}
triggers {
periodic(5)
}
}
36 changes: 18 additions & 18 deletions demos/jobs/pipeline.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
jobs:
- script: >
folder('testjobs')
folder('testjobs')
- script: >
pipelineJob('testjobs/default-agent') {
definition {
cps {
script("""\
pipeline {
agent any
stages {
stage ('test') {
steps {
echo "hello"
}
}
}
}""".stripIndent())
}
}
}
pipelineJob('testjobs/default-agent') {
definition {
cps {
script("""\
pipeline {
agent any
stages {
stage ('test') {
steps {
echo "hello"
}
}
}
}""".stripIndent())
}
}
}
2 changes: 1 addition & 1 deletion demos/kubernetes-helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Master:

Now, deploy the Helm chart with those customized values:

```
```bash
helm install --name jenkins stable/jenkins -f values.yaml
```

Expand Down
55 changes: 27 additions & 28 deletions demos/kubernetes-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ Master:
Image: "jenkins/jenkins"
ImageTag: "lts"
ImagePullPolicy: "Always"
# ImagePullSecret: jenkins
# ImagePullSecret: jenkins
Component: "jenkins-master"
UseSecurity: true
AdminUser: admin
# AdminPassword: "<defaults to random>"
# AdminPassword: "<defaults to random>"
OwnSshKey: false
# If CasC auto-reload is enabled, an SSH (RSA) keypair is needed. Can either provide your own, or leave unconfigured\false to allow a random key to be auto-generated.
# If you choose to use your own, you must upload your decrypted RSA private key (not the public key above) to a Kubernetes secret using the following command:
Expand Down Expand Up @@ -76,52 +76,51 @@ Master:
ContainerEnv:
InitContainerEnv:

# Set min/max heap here if needed with:
# JavaOpts: "-Xms512m -Xmx512m"
# Optionally configure a JMX port
# requires additional JavaOpts, ie
# JavaOpts: >
# -Dcom.sun.management.jmxremote.port=4000
# -Dcom.sun.management.jmxremote.authenticate=false
# -Dcom.sun.management.jmxremote.ssl=false
# JMXPort: 4000
# List of plugins to be install during Jenkins master start
# Set min/max heap here if needed with:
# JavaOpts: "-Xms512m -Xmx512m"
# Optionally configure a JMX port
# requires additional JavaOpts, ie
# JavaOpts: >
# -Dcom.sun.management.jmxremote.port=4000
# -Dcom.sun.management.jmxremote.authenticate=false
# -Dcom.sun.management.jmxremote.ssl=false
# JMXPort: 4000
# List of plugins to be install during Jenkins master start
InstallPlugins:
- kubernetes:latest
- kubernetes-credentials:latest
- workflow-aggregator:latest
- workflow-job:latest
- credentials-binding:latest
- git:latest
- kubernetes:latest
- kubernetes-credentials:latest
- workflow-aggregator:latest
- workflow-job:latest
- credentials-binding:latest
- git:latest

# - saml:1.0.5
# - docker-custom-build-environment:latest
# Used to approve a list of groovy functions in pipelines used the script-security plugin. Can be viewed under /scriptApproval
# - saml:1.0.5
# - docker-custom-build-environment:latest
# Used to approve a list of groovy functions in pipelines used the script-security plugin. Can be viewed under /scriptApproval
# ScriptApproval:
# - "method groovy.json.JsonSlurperClassic parseText java.lang.String"
# - "new groovy.json.JsonSlurperClassic"
# List of groovy init scripts to be executed during Jenkins master start
# List of groovy init scripts to be executed during Jenkins master start
InitScripts:
# - |
# print 'adding global pipeline libraries, register properties, bootstrap jobs...'
# - |
# print 'adding global pipeline libraries, register properties, bootstrap jobs...'
CustomConfigMap: false

ServicePort: 8080
# For minikube, set this to NodePort, elsewhere use LoadBalancer
# Use ClusterIP if your setup includes ingress controller
# For minikube, set this to NodePort, elsewhere use LoadBalancer
# Use ClusterIP if your setup includes ingress controller
ServiceType: ClusterIP
ServiceAnnotations: {}
ContainerPort: 8080
SlaveListenerPort: 50000
LoadBalancerSourceRanges:
- 0.0.0.0/0
- 0.0.0.0/0
# HostName: jenkins.cicd.your.cloud
Ingress:
Enabled: false
# Annotations:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "false"

# TLS:
# - secretName: jenkins.cicd.your.cloud
# hosts:
Expand Down
Loading