Merge "Normalize newlines at end of file"

This commit is contained in:
Zuul 2018-06-29 21:15:01 +00:00 committed by Gerrit Code Review
commit 637676375a
194 changed files with 158 additions and 206 deletions

View File

@ -20,4 +20,3 @@ Indices and tables
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`

View File

@ -27,4 +27,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -13,4 +13,3 @@ builders:
use-build-time: true
steps:
- shell: "sl"

View File

@ -12,4 +12,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -12,4 +12,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -43,4 +43,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -43,4 +43,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -14,4 +14,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -13,4 +13,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -4,4 +4,3 @@ builders:
steps:
- shell: 'first command'
- shell: 'second command'

View File

@ -7,4 +7,3 @@ builders:
condition-basedir: workspace
steps:
- shell: "touch $WORKSPACE/mytestfile"

View File

@ -22,4 +22,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -4,4 +4,4 @@ builders:
condition-worst: ABORTED
condition-best: NOT_BUILD
steps:
- shell: "sl"
- shell: "sl"

View File

@ -13,4 +13,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -26,4 +26,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -17,4 +17,3 @@ builders:
condition-basedir: "jenkins-home"
steps:
- shell: "sl"

View File

@ -12,4 +12,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -22,4 +22,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -4,4 +4,4 @@ builders:
condition-worst: SUCCESS
condition-best: FAILURE
steps:
- shell: "sl"
- shell: "sl"

View File

@ -22,4 +22,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -4,4 +4,4 @@ builders:
condition-worst: UNSTABLE
condition-best: SUCCESS
steps:
- shell: "sl"
- shell: "sl"

View File

@ -15,4 +15,4 @@
</buildStep>
</org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
</builders>
</project>
</project>

View File

@ -1,2 +1,2 @@
builders:
- critical-block-end
- critical-block-end

View File

@ -1,3 +1,3 @@
builders:
- critical-block-start
- critical-block-end
- critical-block-end

View File

@ -10,4 +10,3 @@ builders:
skip-tag: false
file-path: '/tmp/'
build-context: '/tmp/'

View File

@ -16,4 +16,3 @@ builders:
server:
uri: 'unix:///var/run/docker.sock'
credentials-id: 'docker-server'

View File

@ -19,8 +19,9 @@ username=fedora-atomic
&quot;namespace&quot;: &quot;rpms&quot;,
&quot;repo&quot;: &quot;php-simplepie&quot;,
&quot;status&quot;: &quot;&lt;success/failure/aborted&gt;&quot;,
&quot;test_guidance&quot;: &quot;&lt;comma-separated-list-of-test-suites-to-run&gt;&quot;}
}</messageContent>
&quot;test_guidance&quot;: &quot;&lt;comma-separated-list-of-test-suites-to-run&gt;&quot;
}
</messageContent>
</com.redhat.jenkins.plugins.ci.CIMessageBuilder>
</builders>
</project>
</project>

View File

@ -16,5 +16,5 @@ builders:
"namespace": "rpms",
"repo": "php-simplepie",
"status": "<success/failure/aborted>",
"test_guidance": "<comma-separated-list-of-test-suites-to-run>"}
}
"test_guidance": "<comma-separated-list-of-test-suites-to-run>"
}

View File

@ -8,4 +8,4 @@
<messageContent>test</messageContent>
</com.redhat.jenkins.plugins.ci.CIMessageBuilder>
</builders>
</project>
</project>

View File

@ -3,4 +3,4 @@ builders:
provider-name: fedmsg
msg-type: CodeQualityChecksDone
msg-props: test
msg-content: test
msg-content: test

View File

@ -10,5 +10,5 @@ builders:
java-opts:
- "-Xms512m -Xmx1024m"
- "-XX:PermSize=128m -XX:MaxPermSize=256m"
settings: mvn/settings.xml
global-settings: mvn/globalsettings.xml
settings: mvn/settings.xml
global-settings: mvn/globalsettings.xml

View File

@ -9,4 +9,4 @@
<verbose>true</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftBuildVerifier>
</builders>
</project>
</project>

View File

@ -4,4 +4,4 @@ builders:
bld-cfg: front
namespace: test-build
auth-token: ose-key-buildv1
verbose: true
verbose: true

View File

@ -9,4 +9,4 @@
<verbose>false</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftBuildVerifier>
</builders>
</project>
</project>

View File

@ -1,2 +1,2 @@
builders:
- openshift-build-verify
- openshift-build-verify

View File

@ -12,4 +12,4 @@
<showBuildLogs>true</showBuildLogs>
</com.openshift.jenkins.plugins.pipeline.OpenShiftBuilder>
</builders>
</project>
</project>

View File

@ -7,4 +7,4 @@ builders:
commit-ID: ae489f7d
verbose: true
build-name: ose-test-build
show-build-logs: true
show-build-logs: true

View File

@ -12,4 +12,4 @@
<showBuildLogs>false</showBuildLogs>
</com.openshift.jenkins.plugins.pipeline.OpenShiftBuilder>
</builders>
</project>
</project>

View File

@ -1,2 +1,2 @@
builders:
- openshift-builder
- openshift-builder

View File

@ -9,4 +9,4 @@
<verbose>true</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftCreator>
</builders>
</project>
</project>

View File

@ -4,4 +4,4 @@ builders:
jsonyaml: 'front: back'
namespace: test6
auth-token: ose-key-creator1
verbose: true
verbose: true

View File

@ -9,4 +9,4 @@
<verbose>false</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftCreator>
</builders>
</project>
</project>

View File

@ -1,2 +1,2 @@
builders:
- openshift-creator
- openshift-creator

View File

@ -10,4 +10,4 @@
<verbose>true</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftDeploymentVerifier>
</builders>
</project>
</project>

View File

@ -5,4 +5,4 @@ builders:
namespace: test6
replica-count: 4
auth-token: ose-key-dep-verify1
verbose: true
verbose: true

View File

@ -10,4 +10,4 @@
<verbose>false</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftDeploymentVerifier>
</builders>
</project>
</project>

View File

@ -1,2 +1,2 @@
builders:
- openshift-dep-verify
- openshift-dep-verify

View File

@ -9,4 +9,4 @@
<verbose>true</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftDeployer>
</builders>
</project>
</project>

View File

@ -4,4 +4,4 @@ builders:
dep-cfg: front
namespace: test3
auth-token: ose-key-deployer1
verbose: true
verbose: true

View File

@ -9,4 +9,4 @@
<verbose>false</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftDeployer>
</builders>
</project>
</project>

View File

@ -1,2 +1,2 @@
builders:
- openshift-deployer
- openshift-deployer

View File

@ -10,4 +10,4 @@
<verbose>true</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftImageTagger>
</builders>
</project>
</project>

View File

@ -5,4 +5,4 @@ builders:
prod-tag: origin-nodejs-sample:production
namespace: test5
auth-token: ose-key-img1
verbose: true
verbose: true

View File

@ -10,4 +10,4 @@
<verbose>false</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftImageTagger>
</builders>
</project>
</project>

View File

@ -1,2 +1,2 @@
builders:
- openshift-img-tagger
- openshift-img-tagger

View File

@ -10,4 +10,4 @@
<verbose>true</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftScaler>
</builders>
</project>
</project>

View File

@ -5,4 +5,4 @@ builders:
namespace: test2
replica-count: 4
auth-token: ose-key-scaler1
verbose: true
verbose: true

View File

@ -10,4 +10,4 @@
<verbose>false</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftScaler>
</builders>
</project>
</project>

View File

@ -1,2 +1,2 @@
builders:
- openshift-scaler
- openshift-scaler

View File

@ -9,4 +9,4 @@
<verbose>true</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftServiceVerifier>
</builders>
</project>
</project>

View File

@ -4,4 +4,4 @@ builders:
svc-name: front
namespace: test4
auth-token: ose-key-svc-verify1
verbose: true
verbose: true

View File

@ -9,4 +9,4 @@
<verbose>false</verbose>
</com.openshift.jenkins.plugins.pipeline.OpenShiftServiceVerifier>
</builders>
</project>
</project>

View File

@ -1,2 +1,2 @@
builders:
- openshift-svc-verify
- openshift-svc-verify

View File

@ -1,4 +1,4 @@
builders:
- ssh-builder:
ssh-user-ip: foo@bar:22
command: echo foo
command: echo foo

View File

@ -2,4 +2,3 @@ builders:
- tox:
ini: "foo.conf"
toxenv-pattern: TOX_ENV

View File

@ -6,4 +6,4 @@ builders:
parameter-name: filename
file-pattern: propfile*.txt
no-files-found-action: FAIL
block: true
block: true

View File

@ -5,4 +5,4 @@ builders:
- factory: binaryfile
parameter-name: filename
file-pattern: propfile*.txt
block: true
block: true

View File

@ -10,4 +10,4 @@ builders:
parameters: |
EXAMPLE=NICE
HELLO=WORLD
block: true
block: true

View File

@ -6,4 +6,4 @@ builders:
from: 0
to: 5
step: 1
block: true
block: true

View File

@ -5,4 +5,4 @@ builders:
- factory: filebuild
file-pattern: propfile*.txt
no-files-found-action: NOPARMS
block: true
block: true

View File

@ -4,4 +4,4 @@ builders:
parameter-factories:
- factory: filebuild
file-pattern: propfile*.txt
block: true
block: true

View File

@ -1,4 +1,4 @@
builders:
- trigger-builds:
- project: "build_started"
git-revision: false
git-revision: false

View File

@ -1,2 +1,2 @@
[job_builder]
recursive=True
recursive=True

View File

@ -4,4 +4,4 @@
- 'job1'
- job:
name: 'job1'
name: 'job1'

View File

@ -5,4 +5,4 @@
- job:
name: 'job2'
disabled: True
disabled: True

View File

@ -5,4 +5,4 @@
- job:
name: 'job4'
project-type: matrix
project-type: matrix

View File

@ -6,4 +6,4 @@
- job:
name: 'job3'
display-name: 'herp derp derp'
disabled: True
disabled: True

View File

@ -1,2 +1,2 @@
[jenkins]
timeout=0.2
timeout=0.2

View File

@ -18,4 +18,3 @@
name: duplicate_macros
scm:
- project-scm

View File

@ -18,4 +18,3 @@
name: duplicate_macros
scm:
- project-scm

View File

@ -29,4 +29,4 @@
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<concurrentBuild>false</concurrentBuild>
<canRoam>true</canRoam>
</matrix-project>
</matrix-project>

View File

@ -6,4 +6,4 @@
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<concurrentBuild>false</concurrentBuild>
<canRoam>true</canRoam>
</hudson.model.ExternalJob>
</hudson.model.ExternalJob>

View File

@ -1,2 +1,2 @@
name: openstack-infra
project-type: externaljob
project-type: externaljob

View File

@ -10,4 +10,4 @@
]
}
}
]
]

View File

@ -17,4 +17,4 @@
</builders>
<publishers/>
<buildWrappers/>
</project>
</project>

View File

@ -7,7 +7,7 @@
"shell": "#!/bin/bash\n#\n# Sample script showing how the yaml include-raw tag can be used\n# to inline scripts that are maintained outside of the jenkins\n# job yaml configuration.\n\necho \"hello world\"\n\nexit 0\n"
},
{
"shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${{VAR1}} ${{VAR2}}\"\n\n[[ -n \"${{VAR3}}\" ]] && {{\n # this next section is executed as one\n echo \"${{VAR3}}\"\n exit 0\n}}\n\n"
"shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${{VAR1}} ${{VAR2}}\"\n\n[[ -n \"${{VAR3}}\" ]] && {{\n # this next section is executed as one\n echo \"${{VAR3}}\"\n exit 0\n}}\n"
}
]
}

View File

@ -7,7 +7,7 @@
"shell": "#!/bin/bash\n#\n# Sample script showing how the yaml include-raw tag can be used\n# to inline scripts that are maintained outside of the jenkins\n# job yaml configuration.\n\necho \"hello world\"\n\nexit 0\n"
},
{
"shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${VAR1} ${VAR2}\"\n\n[[ -n \"${VAR3}\" ]] && {\n # this next section is executed as one\n echo \"${VAR3}\"\n exit 0\n}\n\n"
"shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${VAR1} ${VAR2}\"\n\n[[ -n \"${VAR3}\" ]] && {\n # this next section is executed as one\n echo \"${VAR3}\"\n exit 0\n}\n"
}
]
}

View File

@ -4,7 +4,7 @@
"name": "test-job-include-raw-{num}",
"builders": [
{
"shell": "#!/bin/bash\n#\n# Sample script showing how the yaml include-raw tag can be used\n# to inline scripts that are maintained outside of the jenkins\n# job yaml configuration.\n\necho \"hello world\"\n\nexit 0\n\n#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${{VAR1}} ${{VAR2}}\"\n\n[[ -n \"${{VAR3}}\" ]] && {{\n # this next section is executed as one\n echo \"${{VAR3}}\"\n exit 0\n}}\n\n"
"shell": "#!/bin/bash\n#\n# Sample script showing how the yaml include-raw tag can be used\n# to inline scripts that are maintained outside of the jenkins\n# job yaml configuration.\n\necho \"hello world\"\n\nexit 0\n\n#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${{VAR1}} ${{VAR2}}\"\n\n[[ -n \"${{VAR3}}\" ]] && {{\n # this next section is executed as one\n echo \"${{VAR3}}\"\n exit 0\n}}\n"
}
]
}

View File

@ -7,7 +7,7 @@
"shell": "#!/bin/bash\n#\n# Sample script showing how the yaml include-raw tag can be used\n# to inline scripts that are maintained outside of the jenkins\n# job yaml configuration.\n\necho \"hello world\"\n\nexit 0\n"
},
{
"shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${{VAR1}} ${{VAR2}}\"\n\n[[ -n \"${{VAR3}}\" ]] && {{\n # this next section is executed as one\n echo \"${{VAR3}}\"\n exit 0\n}}\n\n"
"shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${{VAR1}} ${{VAR2}}\"\n\n[[ -n \"${{VAR3}}\" ]] && {{\n # this next section is executed as one\n echo \"${{VAR3}}\"\n exit 0\n}}\n"
}
]
}

View File

@ -4,7 +4,7 @@
"name": "test-job-include-raw-1",
"builders": [
{
"shell": "#!/bin/bash\n#\n# Sample script showing how the yaml include-raw tag can be used\n# to inline scripts that are maintained outside of the jenkins\n# job yaml configuration.\n\necho \"hello world\"\n\nexit 0\n\n#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${VAR1} ${VAR2}\"\n\n[[ -n \"${VAR3}\" ]] && {\n # this next section is executed as one\n echo \"${VAR3}\"\n exit 0\n}\n\n"
"shell": "#!/bin/bash\n#\n# Sample script showing how the yaml include-raw tag can be used\n# to inline scripts that are maintained outside of the jenkins\n# job yaml configuration.\n\necho \"hello world\"\n\nexit 0\n\n#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${VAR1} ${VAR2}\"\n\n[[ -n \"${VAR3}\" ]] && {\n # this next section is executed as one\n echo \"${VAR3}\"\n exit 0\n}\n"
}
]
}

View File

@ -12,4 +12,3 @@ VAR3="${VAR1} ${VAR2}"
echo "${VAR3}"
exit 0
}

View File

@ -7,7 +7,7 @@
"shell": "#!/bin/bash\n#\n# Sample script showing how the yaml include-raw tag can be used\n# to inline scripts that are maintained outside of the jenkins\n# job yaml configuration.\n\necho \"hello world\"\n\nexit 0\n"
},
{
"shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${VAR1} ${VAR2}\"\n\n[[ -n \"${VAR3}\" ]] && {\n # this next section is executed as one\n echo \"${VAR3}\"\n exit 0\n}\n\n"
"shell": "#!/bin/bash\n#\n# sample script to check that brackets aren't escaped\n# when using the include-raw application yaml tag\n\nVAR1=\"hello\"\nVAR2=\"world\"\nVAR3=\"${VAR1} ${VAR2}\"\n\n[[ -n \"${VAR3}\" ]] && {\n # this next section is executed as one\n echo \"${VAR3}\"\n exit 0\n}\n"
}
]
}

View File

@ -5,4 +5,3 @@ scm:
repo: 'foo'
repo-owner: 'johndoe'
discover-pr-forks-strategy: false

View File

@ -1,3 +1,3 @@
notifications:
- http:
url: http://example.com/jenkins_endpoint
url: http://example.com/jenkins_endpoint

View File

@ -4,4 +4,4 @@ notifications:
format: xml
event: completed
timeout: 40000
log: -1
log: -1

View File

@ -4,4 +4,4 @@ parameters:
description: "Available options"
script: "['optionA', 'optionB']"
remote: false
read-only: false
read-only: false

View File

@ -8,4 +8,3 @@ parameters:
- slave003
ignore-offline-nodes: true
allowed-multiselect: true

View File

@ -8,4 +8,3 @@ parameters:
- slave003
ignore-offline-nodes: true
allowed-multiselect: false

View File

@ -2,4 +2,3 @@ properties:
- branch-api:
time-period: Day
number-of-builds: 5

View File

@ -1,2 +1,2 @@
properties:
- delivery-pipeline
- delivery-pipeline

Some files were not shown because too many files have changed in this diff Show More