Merge "Make unit tests compatible with Python 3.13"
This commit is contained in:
Zuul
Gerrit Code Review
commit
26d10f4f18
@ -10,7 +10,7 @@
|
||||
<installDir>path/to/install</installDir>
|
||||
<makeCommand>/usr/bin/make</makeCommand>
|
||||
<installCommand>make new-install</installCommand>
|
||||
<cmakeArgs>-DCMAKE_FIND_ROOT_PATH="path/to/something/else"</cmakeArgs>
|
||||
<cmakeArgs>-DCMAKE_FIND_ROOT_PATH="path/to/something/else"</cmakeArgs>
|
||||
<projectCmakePath>/usr/bin/cmake</projectCmakePath>
|
||||
<cleanInstallDir>true</cleanInstallDir>
|
||||
<buildType>Debug</buildType>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<workingDir>path/to/build</workingDir>
|
||||
<buildType>CustomReleaseType</buildType>
|
||||
<installationName>CMake custom install</installationName>
|
||||
<toolArgs>-DCMAKE_FIND_ROOT_PATH="path/to/something/else"</toolArgs>
|
||||
<toolArgs>-DCMAKE_FIND_ROOT_PATH="path/to/something/else"</toolArgs>
|
||||
<toolSteps>
|
||||
<hudson.plugins.cmake.BuildToolStep>
|
||||
<withCmake>true</withCmake>
|
||||
@ -21,8 +21,8 @@ URL=http://www.example.org/
|
||||
<hudson.plugins.cmake.BuildToolStep>
|
||||
<withCmake>false</withCmake>
|
||||
<args>test</args>
|
||||
<vars>RESTRICT="TRUE"
|
||||
TARGET="NONE"
|
||||
<vars>RESTRICT="TRUE"
|
||||
TARGET="NONE"
|
||||
</vars>
|
||||
</hudson.plugins.cmake.BuildToolStep>
|
||||
</toolSteps>
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
<dockerfilePath>/tmp/</dockerfilePath>
|
||||
<buildContext>/tmp/</buildContext>
|
||||
<createFingerprint>true</createFingerprint>
|
||||
<buildAdditionalArgs>--build-arg https_proxy="http://some.proxy:port"</buildAdditionalArgs>
|
||||
<buildAdditionalArgs>--build-arg https_proxy="http://some.proxy:port"</buildAdditionalArgs>
|
||||
<forceTag>true</forceTag>
|
||||
</com.cloudbees.dockerpublish.DockerBuilder>
|
||||
</builders>
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
<dockerfilePath>/tmp/</dockerfilePath>
|
||||
<buildContext>/tmp/</buildContext>
|
||||
<createFingerprint>true</createFingerprint>
|
||||
<buildAdditionalArgs>--build-arg https_proxy="http://some.proxy:port"</buildAdditionalArgs>
|
||||
<buildAdditionalArgs>--build-arg https_proxy="http://some.proxy:port"</buildAdditionalArgs>
|
||||
<forceTag>true</forceTag>
|
||||
<server plugin="docker-commons">
|
||||
<credentialsId>docker-server</credentialsId>
|
||||
|
||||
@ -11,15 +11,15 @@
|
||||
username=fedora-atomic
|
||||
</messageProperties>
|
||||
<messageContent>{
|
||||
"build_url": "${BUILD_URL}",
|
||||
"compose_url": "<full-url-to-compose>",
|
||||
"build_id": "${BUILD_ID}",
|
||||
"ref": "fedora/rawhide/${basearch}/atomic-host",
|
||||
"rev": "<sha of the commit from dist-git>",
|
||||
"namespace": "rpms",
|
||||
"repo": "php-simplepie",
|
||||
"status": "<success/failure/aborted>",
|
||||
"test_guidance": "<comma-separated-list-of-test-suites-to-run>"
|
||||
"build_url": "${BUILD_URL}",
|
||||
"compose_url": "<full-url-to-compose>",
|
||||
"build_id": "${BUILD_ID}",
|
||||
"ref": "fedora/rawhide/${basearch}/atomic-host",
|
||||
"rev": "<sha of the commit from dist-git>",
|
||||
"namespace": "rpms",
|
||||
"repo": "php-simplepie",
|
||||
"status": "<success/failure/aborted>",
|
||||
"test_guidance": "<comma-separated-list-of-test-suites-to-run>"
|
||||
}
|
||||
</messageContent>
|
||||
</com.redhat.jenkins.plugins.ci.CIMessageBuilder>
|
||||
|
||||
@ -60,7 +60,7 @@
|
||||
<currParams>false</currParams>
|
||||
<configs>
|
||||
<hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
|
||||
<filter>JVM_VARIANT == "server"</filter>
|
||||
<filter>JVM_VARIANT == "server"</filter>
|
||||
</hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
|
||||
</configs>
|
||||
<abortAllJob>false</abortAllJob>
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
<hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
|
||||
<hudson.plugins.parameterizedtrigger.SubversionRevisionBuildParameters/>
|
||||
<hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
|
||||
<properties>FOO="bar"</properties>
|
||||
<properties>FOO="bar"</properties>
|
||||
</hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
|
||||
</configs>
|
||||
<configFactories>
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
<hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
|
||||
<hudson.plugins.parameterizedtrigger.SubversionRevisionBuildParameters/>
|
||||
<hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
|
||||
<properties>FOO="bar"</properties>
|
||||
<properties>FOO="bar"</properties>
|
||||
</hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
|
||||
</configs>
|
||||
<projects>build_started</projects>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<configs>
|
||||
<hudson.plugins.parameterizedtrigger.NodeParameters/>
|
||||
<hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
|
||||
<properties>FOO="bar"</properties>
|
||||
<properties>FOO="bar"</properties>
|
||||
</hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
|
||||
<hudson.plugins.parameterizedtrigger.BooleanParameters>
|
||||
<configs>
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<combineQueuedCommits>false</combineQueuedCommits>
|
||||
</hudson.plugins.git.GitRevisionBuildParameters>
|
||||
<hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
|
||||
<properties>FOO="bar"</properties>
|
||||
<properties>FOO="bar"</properties>
|
||||
</hudson.plugins.parameterizedtrigger.PredefinedBuildParameters>
|
||||
<org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.NodeLabelBuildParameter>
|
||||
<name>NODE</name>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
|
||||
<configs>
|
||||
<hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
|
||||
<filter>label=="x86"</filter>
|
||||
<filter>label=="x86"</filter>
|
||||
</hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
|
||||
</configs>
|
||||
<projects>build_started</projects>
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
<enhancedLogging>true</enhancedLogging>
|
||||
<preventRemoteBuildQueue>true</preventRemoteBuildQueue>
|
||||
<blockBuildUntilComplete>true</blockBuildUntilComplete>
|
||||
<parameters>FOO="bar"
|
||||
herp="derp"
|
||||
<parameters>FOO="bar"
|
||||
herp="derp"
|
||||
</parameters>
|
||||
<parameterList>
|
||||
<string>FOO="bar"</string>
|
||||
<string>herp="derp"</string>
|
||||
<string>FOO="bar"</string>
|
||||
<string>herp="derp"</string>
|
||||
</parameterList>
|
||||
<loadParamsFromFile>true</loadParamsFromFile>
|
||||
<parameterFile>.props</parameterFile>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash
|
||||
echo "Unicode! ?"
|
||||
echo "Unicode! ?"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</buildSteps>
|
||||
|
||||
@ -157,7 +157,12 @@ def check_generator(scenario, input, expected_output, jjb_config, registry, proj
|
||||
|
||||
generator = Generator(registry)
|
||||
generator.gen_xml(xml, input)
|
||||
pretty_xml = XmlJob(xml, "fixturejob").output().decode()
|
||||
pretty_xml = (
|
||||
XmlJob(xml, "fixturejob")
|
||||
.output()
|
||||
.decode()
|
||||
.replace(""", '"') # Ensure compatibility with Python < 3.13
|
||||
)
|
||||
assert expected_output == pretty_xml
|
||||
|
||||
return check
|
||||
@ -198,6 +203,7 @@ def check_job(scenario, expected_output, jjb_config, registry):
|
||||
"\n".join(job.output().decode() for job in job_xml_list)
|
||||
.strip()
|
||||
.replace("\n\n", "\n")
|
||||
.replace(""", '"') # Ensure compatibility with Python < 3.13
|
||||
)
|
||||
if expected_output is None:
|
||||
return
|
||||
|
||||
@ -116,7 +116,7 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/usr/bin/env python
|
||||
#
|
||||
print("Doing something cool with python")
|
||||
print("Doing something cool with python")
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
@ -136,12 +136,12 @@ print("Doing something cool with python")
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash
|
||||
echo "Doing somethiung cool"
|
||||
echo "Doing somethiung cool"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/zsh
|
||||
echo "Doing somethin cool with zsh"
|
||||
echo "Doing somethin cool with zsh"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Ant>
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
# sample script to check that variables are expanded
|
||||
# when using the !include-raw-expand: application yaml tag
|
||||
|
||||
VAR1="1"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="1"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# to inline scripts that are maintained outside of the jenkins
|
||||
# job yaml configuration.
|
||||
|
||||
echo "hello world"
|
||||
echo "hello world"
|
||||
|
||||
exit 0
|
||||
</command>
|
||||
@ -28,13 +28,13 @@ exit 0
|
||||
# sample script to check that variables aren't expanded
|
||||
# when using the !include-raw-verbatim: application yaml tag
|
||||
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# to inline scripts that are maintained outside of the jenkins
|
||||
# job yaml configuration.
|
||||
|
||||
echo "hello world"
|
||||
echo "hello world"
|
||||
|
||||
exit 0
|
||||
|
||||
@ -26,13 +26,13 @@ exit 0
|
||||
# sample script to check that variables aren't expanded
|
||||
# when using the !include-raw-verbatim: application yaml tag
|
||||
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# to inline scripts that are maintained outside of the jenkins
|
||||
# job yaml configuration.
|
||||
|
||||
echo "hello world"
|
||||
echo "hello world"
|
||||
|
||||
exit 0
|
||||
|
||||
@ -26,13 +26,13 @@ exit 0
|
||||
# sample script to check that variables aren't expanded
|
||||
# when using the !include-raw-verbatim: application yaml tag
|
||||
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# to inline scripts that are maintained outside of the jenkins
|
||||
# job yaml configuration.
|
||||
|
||||
echo "hello world"
|
||||
echo "hello world"
|
||||
|
||||
exit 0
|
||||
</command>
|
||||
@ -28,13 +28,13 @@ exit 0
|
||||
# sample script to check that variables aren't expanded
|
||||
# when using the !include-raw-verbatim: application yaml tag
|
||||
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -19,9 +19,9 @@ DIFFERENT_ENV_VAR=different
|
||||
|
||||
|
||||
# Debug output
|
||||
echo -e "\n\n\n"
|
||||
echo -e "\n\n\n"
|
||||
sort | env
|
||||
echo -e "\n\n\n"
|
||||
echo -e "\n\n\n"
|
||||
|
||||
# Test Command
|
||||
bundle install
|
||||
|
||||
@ -136,7 +136,7 @@
|
||||
<descriptionPropertyFile/>
|
||||
<descriptionPropertyKey/>
|
||||
<bindings/>
|
||||
<groovyScript>import net.sf.json.JSONObject; def jsonEditorOptions = JSONObject.fromObject(/{schema: {"type": "object", "title": "Name", "properties": {"name": {"type": "string", "propertyOrder" : 1}}}}/);</groovyScript>
|
||||
<groovyScript>import net.sf.json.JSONObject; def jsonEditorOptions = JSONObject.fromObject(/{schema: {"type": "object", "title": "Name", "properties": {"name": {"type": "string", "propertyOrder" : 1}}}}/);</groovyScript>
|
||||
<groovyScriptFile/>
|
||||
<groovyClasspath/>
|
||||
<defaultGroovyScript/>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
</hudson.plugins.batch__task.BatchTask>
|
||||
<hudson.plugins.batch__task.BatchTask>
|
||||
<name>say hello</name>
|
||||
<script>echo "Hello world"</script>
|
||||
<script>echo "Hello world"</script>
|
||||
</hudson.plugins.batch__task.BatchTask>
|
||||
</tasks>
|
||||
</hudson.plugins.batch__task.BatchTaskProperty>
|
||||
|
||||
@ -11,15 +11,15 @@
|
||||
username=fedora-atomic
|
||||
</messageProperties>
|
||||
<messageContent>{
|
||||
"build_url": "${BUILD_URL}",
|
||||
"compose_url": "<full-url-to-compose>",
|
||||
"build_id": "${BUILD_ID}",
|
||||
"ref": "fedora/rawhide/${basearch}/atomic-host",
|
||||
"rev": "<sha of the commit from dist-git>",
|
||||
"namespace": "rpms",
|
||||
"repo": "php-simplepie",
|
||||
"status": "<success/failure/aborted>",
|
||||
"test_guidance": "<comma-separated-list-of-test-suites-to-run>"}
|
||||
"build_url": "${BUILD_URL}",
|
||||
"compose_url": "<full-url-to-compose>",
|
||||
"build_id": "${BUILD_ID}",
|
||||
"ref": "fedora/rawhide/${basearch}/atomic-host",
|
||||
"rev": "<sha of the commit from dist-git>",
|
||||
"namespace": "rpms",
|
||||
"repo": "php-simplepie",
|
||||
"status": "<success/failure/aborted>",
|
||||
"test_guidance": "<comma-separated-list-of-test-suites-to-run>"}
|
||||
</messageContent>
|
||||
</com.redhat.jenkins.plugins.ci.CIMessageNotifier>
|
||||
</publishers>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
</logTexts>
|
||||
<EscalateStatus>true</EscalateStatus>
|
||||
<RunIfJobSuccessful>true</RunIfJobSuccessful>
|
||||
<script>echo "Here goes the task script"
|
||||
<script>echo "Here goes the task script"
|
||||
</script>
|
||||
</hudson.plugins.postbuildtask.TaskProperties>
|
||||
</tasks>
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
</logTexts>
|
||||
<EscalateStatus>true</EscalateStatus>
|
||||
<RunIfJobSuccessful>true</RunIfJobSuccessful>
|
||||
<script>echo "Here goes the task script"
|
||||
<script>echo "Here goes the task script"
|
||||
</script>
|
||||
</hudson.plugins.postbuildtask.TaskProperties>
|
||||
</tasks>
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
</results>
|
||||
<executeOn>MATRIX</executeOn>
|
||||
<role>MASTER</role>
|
||||
<content>println "Hello world!"</content>
|
||||
<content>println "Hello world!"</content>
|
||||
</org.jenkinsci.plugins.postbuildscript.model.Script>
|
||||
<org.jenkinsci.plugins.postbuildscript.model.Script>
|
||||
<results>
|
||||
@ -63,8 +63,8 @@
|
||||
<string>FAILURE</string>
|
||||
</results>
|
||||
<role>SLAVE</role>
|
||||
<content>println "Hello world!"
|
||||
println "Multi-line script"
|
||||
<content>println "Hello world!"
|
||||
println "Multi-line script"
|
||||
</content>
|
||||
</org.jenkinsci.plugins.postbuildscript.model.Script>
|
||||
</groovyScripts>
|
||||
@ -78,7 +78,7 @@ println "Multi-line script"
|
||||
<role>MASTER</role>
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "Hello world!"</command>
|
||||
<command>echo "Hello world!"</command>
|
||||
</hudson.tasks.Shell>
|
||||
</buildSteps>
|
||||
</org.jenkinsci.plugins.postbuildscript.model.PostBuildStep>
|
||||
@ -92,10 +92,10 @@ println "Multi-line script"
|
||||
<role>SLAVE</role>
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "Hello world!"</command>
|
||||
<command>echo "Hello world!"</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "Goodbye world!"</command>
|
||||
<command>echo "Goodbye world!"</command>
|
||||
</hudson.tasks.Shell>
|
||||
</buildSteps>
|
||||
</org.jenkinsci.plugins.postbuildscript.model.PostBuildStep>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<markBuildUnstable>false</markBuildUnstable>
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "Shell execution"</command>
|
||||
<command>echo "Shell execution"</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Ant>
|
||||
<targets>ant_target</targets>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<markBuildUnstable>false</markBuildUnstable>
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "Shell execution"</command>
|
||||
<command>echo "Shell execution"</command>
|
||||
</hudson.tasks.Shell>
|
||||
</buildSteps>
|
||||
<scriptOnlyIfSuccess>true</scriptOnlyIfSuccess>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<markBuildUnstable>true</markBuildUnstable>
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "Shell execution should be first"</command>
|
||||
<command>echo "Shell execution should be first"</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Ant>
|
||||
<targets>ant_target</targets>
|
||||
|
||||
@ -44,7 +44,7 @@ bar=foo
|
||||
<combineQueuedCommits>true</combineQueuedCommits>
|
||||
</hudson.plugins.git.GitRevisionBuildParameters>
|
||||
<hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
|
||||
<filter>label=="x86"</filter>
|
||||
<filter>label=="x86"</filter>
|
||||
</hudson.plugins.parameterizedtrigger.matrix.MatrixSubsetBuildParameters>
|
||||
</configs>
|
||||
<projects>yet_another_job</projects>
|
||||
|
||||
@ -18,10 +18,10 @@
|
||||
<destinationDir>build</destinationDir>
|
||||
<repoUrl>https://internal.net/projects/repo</repoUrl>
|
||||
<mirrorDir>~/git/project/</mirrorDir>
|
||||
<localManifest><?xml version="1.0" encoding="UTF-8"?>
|
||||
<localManifest><?xml version="1.0" encoding="UTF-8"?>
|
||||
<manifest>
|
||||
<project path="external/project" name="org/project"
|
||||
remote="gerrit" revision="master" />
|
||||
<project path="external/project" name="org/project"
|
||||
remote="gerrit" revision="master" />
|
||||
</manifest>
|
||||
</localManifest>
|
||||
<ignoreProjects class="linked-hash-set">
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<com.redhat.jenkins.plugins.ci.CIBuildTrigger>
|
||||
<spec/>
|
||||
<noSquash>true</noSquash>
|
||||
<selector>topic = "org.fedoraproject.prod.fedimg.image.upload"</selector>
|
||||
<selector>topic = "org.fedoraproject.prod.fedimg.image.upload"</selector>
|
||||
<providerName>fedmsg</providerName>
|
||||
<checks>
|
||||
<com.redhat.jenkins.plugins.ci.messaging.checks.MsgCheck>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<com.redhat.jenkins.plugins.ci.CIBuildTrigger>
|
||||
<spec/>
|
||||
<noSquash>false</noSquash>
|
||||
<selector>topic = "org.fedoraproject.prod.fedimg.image.upload"</selector>
|
||||
<selector>topic = "org.fedoraproject.prod.fedimg.image.upload"</selector>
|
||||
<providerName>fedmsg</providerName>
|
||||
</com.redhat.jenkins.plugins.ci.CIBuildTrigger>
|
||||
</triggers>
|
||||
|
||||
@ -12,10 +12,10 @@
|
||||
</deployReleaseRepository>
|
||||
</details>
|
||||
<uploadSpec>
|
||||
<spec>{ "files": [ { "pattern": "*.jar", "target": "release" } ] }</spec>
|
||||
<spec>{ "files": [ { "pattern": "*.jar", "target": "release" } ] }</spec>
|
||||
</uploadSpec>
|
||||
<downloadSpec>
|
||||
<spec>{ "files": [ { "pattern": "*.jar", "target": "release" } ] }</spec>
|
||||
<spec>{ "files": [ { "pattern": "*.jar", "target": "release" } ] }</spec>
|
||||
</downloadSpec>
|
||||
<useSpecs>true</useSpecs>
|
||||
<deployPattern/>
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash
|
||||
echo "Doing something cool"
|
||||
echo "Doing something cool"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/zsh
|
||||
echo "Doing something cool with zsh"
|
||||
echo "Doing something cool with zsh"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</buildSteps>
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash
|
||||
echo "Doing something cool"
|
||||
echo "Doing something cool"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/zsh
|
||||
echo "Doing something cool with zsh"
|
||||
echo "Doing something cool with zsh"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Ant>
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash
|
||||
echo "Doing something cool"
|
||||
echo "Doing something cool"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/zsh
|
||||
echo "Doing something cool with zsh"
|
||||
echo "Doing something cool with zsh"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</buildSteps>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<buildWrappers>
|
||||
<org.jvnet.hudson.tools.versionnumber.VersionNumberBuilder>
|
||||
<environmentVariableName>relVersion</environmentVariableName>
|
||||
<versionNumberString>${BUILD_DATE_FORMATTED, "yy.M"}.${BUILDS_THIS_MONTH_Z}</versionNumberString>
|
||||
<versionNumberString>${BUILD_DATE_FORMATTED, "yy.M"}.${BUILDS_THIS_MONTH_Z}</versionNumberString>
|
||||
<environmentPrefixVariable>relVersion</environmentPrefixVariable>
|
||||
<skipFailedBuilds>false</skipFailedBuilds>
|
||||
<useAsBuildDisplayName>false</useAsBuildDisplayName>
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/usr/bin/env python
|
||||
#
|
||||
print("Doing something cool with python")
|
||||
print("Doing something cool with python")
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "This should be empty: "
|
||||
<command>echo "This should be empty: "
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "Here -><- you should see nothing"</command>
|
||||
<command>echo "Here -><- you should see nothing"</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
<publishers/>
|
||||
|
||||
@ -114,7 +114,7 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/usr/bin/env python
|
||||
#
|
||||
print("Doing something cool with python")
|
||||
print("Doing something cool with python")
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
@ -134,12 +134,12 @@ print("Doing something cool with python")
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash
|
||||
echo "Doing somethiung cool"
|
||||
echo "Doing somethiung cool"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/zsh
|
||||
echo "Doing somethin cool with zsh"
|
||||
echo "Doing somethin cool with zsh"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Ant>
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "Variable: Goodbye World"
|
||||
echo "Allow empty Variable: Goodbye World"
|
||||
echo "show that we expand for num: 1"
|
||||
<command>echo "Variable: Goodbye World"
|
||||
echo "Allow empty Variable: Goodbye World"
|
||||
echo "show that we expand for num: 1"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
@ -36,9 +36,9 @@ echo "show that we expand for num: 1"
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "Variable: Goodbye World"
|
||||
echo "Allow empty Variable: Goodbye World"
|
||||
echo "show that we expand for num: 2"
|
||||
<command>echo "Variable: Goodbye World"
|
||||
echo "Allow empty Variable: Goodbye World"
|
||||
echo "show that we expand for num: 2"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# to inline scripts that are maintained outside of the jenkins
|
||||
# job yaml configuration.
|
||||
|
||||
echo "hello world"
|
||||
echo "hello world"
|
||||
|
||||
exit 0
|
||||
</command>
|
||||
@ -28,13 +28,13 @@ exit 0
|
||||
# sample script to check that brackets aren't expanded
|
||||
# when using the include-raw-escape application yaml tag
|
||||
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# to inline scripts that are maintained outside of the jenkins
|
||||
# job yaml configuration.
|
||||
|
||||
echo "hello world"
|
||||
echo "hello world"
|
||||
|
||||
exit 0
|
||||
</command>
|
||||
@ -28,13 +28,13 @@ exit 0
|
||||
# sample script to check that brackets aren't expanded
|
||||
# when using the include-raw-escape application yaml tag
|
||||
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# to inline scripts that are maintained outside of the jenkins
|
||||
# job yaml configuration.
|
||||
|
||||
echo "hello world"
|
||||
echo "hello world"
|
||||
|
||||
exit 0
|
||||
</command>
|
||||
@ -28,13 +28,13 @@ exit 0
|
||||
# sample script to check that brackets are expanded
|
||||
# when using the include-raw application yaml tag
|
||||
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# to inline scripts that are maintained outside of the jenkins
|
||||
# job yaml configuration.
|
||||
|
||||
echo "hello world"
|
||||
echo "hello world"
|
||||
|
||||
exit 0
|
||||
</command>
|
||||
@ -28,13 +28,13 @@ exit 0
|
||||
# sample script to check that brackets aren't expanded
|
||||
# when using the include-raw application yaml tag
|
||||
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/usr/bin/env python
|
||||
#
|
||||
print("Doing something cool with python")
|
||||
print("Doing something cool with python")
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>my_filter says "hello"</command>
|
||||
<command>my_filter says "hello"</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
<publishers/>
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "param=bar"
|
||||
<command>echo "param=bar"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
@ -31,7 +31,7 @@
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "param=foo"
|
||||
<command>echo "param=foo"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash
|
||||
echo "Unicode! ☃"
|
||||
echo "Unicode! ☃"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</buildSteps>
|
||||
|
||||
@ -39,12 +39,12 @@
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash
|
||||
echo "Doing somethiung cool"
|
||||
echo "Doing somethiung cool"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/zsh
|
||||
echo "Doing somethin cool with zsh"
|
||||
echo "Doing somethin cool with zsh"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Ant>
|
||||
|
||||
@ -32,11 +32,11 @@
|
||||
# test script containing some variables to show how you can include scripts
|
||||
# into job template definitions provided you use the !include-raw-verbatim: tag
|
||||
|
||||
MSG="hello world"
|
||||
MSG="hello world"
|
||||
|
||||
[[ -n "${MSG}" ]] && {
|
||||
[[ -n "${MSG}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${MSG}"
|
||||
echo "${MSG}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -39,12 +39,12 @@
|
||||
<buildSteps>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/bash
|
||||
echo "Doing somethiung cool"
|
||||
echo "Doing somethiung cool"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/bin/zsh
|
||||
echo "Doing somethin cool with zsh"
|
||||
echo "Doing somethin cool with zsh"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
<hudson.tasks.Ant>
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
# sample script to check that variables aren't expanded
|
||||
# when using the !include-raw-verbatim: application yaml tag
|
||||
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
VAR1="hello"
|
||||
VAR2="world"
|
||||
VAR3="${VAR1} ${VAR2}"
|
||||
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
[[ -n "${VAR3}" ]] && {
|
||||
# this next section is executed as one
|
||||
echo "${VAR3}"
|
||||
echo "${VAR3}"
|
||||
exit 0
|
||||
}
|
||||
</command>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<behavior>0</behavior>
|
||||
<runForMatrixParent>false</runForMatrixParent>
|
||||
<script>
|
||||
<script>if (manager.logContains(".*no_jenkins.*")) {
|
||||
<script>if (manager.logContains(".*no_jenkins.*")) {
|
||||
manager.build.result = hudson.model.Result.NOT_BUILT
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "['repo-1', 'repo-2', 'repo-a1', 'repo-a2']"</command>
|
||||
<command>echo "['repo-1', 'repo-2', 'repo-a1', 'repo-a2']"</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
<publishers/>
|
||||
@ -30,7 +30,7 @@
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "['repo-1', 'repo-2', 'repo-b1', 'repo-b2']"</command>
|
||||
<command>echo "['repo-1', 'repo-2', 'repo-b1', 'repo-b2']"</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
<publishers/>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<flow-definition plugin="workflow-job">
|
||||
<definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps">
|
||||
<script>build job: "job1"
|
||||
<script>build job: "job1"
|
||||
</script>
|
||||
<sandbox>false</sandbox>
|
||||
</definition>
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>echo "hello"</command>
|
||||
<command>echo "hello"</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
<publishers/>
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/usr/bin/env python
|
||||
#
|
||||
print("Doing something cool with python")
|
||||
print("Doing something cool with python")
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
@ -36,7 +36,7 @@ print("Doing something cool with python")
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/usr/bin/env python
|
||||
#
|
||||
print("Doing something cool with python")
|
||||
print("Doing something cool with python")
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
@ -59,7 +59,7 @@ print("Doing something cool with python")
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/usr/bin/env python
|
||||
#
|
||||
print("Doing something else cool with python")
|
||||
print("Doing something else cool with python")
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
@ -82,7 +82,7 @@ print("Doing something else cool with python")
|
||||
<hudson.tasks.Shell>
|
||||
<command>#!/usr/bin/env python
|
||||
#
|
||||
print("Doing something else cool with python")
|
||||
print("Doing something else cool with python")
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
|
||||
@ -15,18 +15,18 @@
|
||||
#
|
||||
# version 1.1 of the echo vars script
|
||||