diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py
index fa775a322..8e356acf6 100644
--- a/jenkins_jobs/modules/builders.py
+++ b/jenkins_jobs/modules/builders.py
@@ -2456,8 +2456,8 @@ def openshift_build_verify(parser, xml_parent, data):
provided buildConfig key provided; once the list of builds are obtained,
the state of the latest build is inspected for up to a minute to see if
it has completed successfully.
- Requires the Jenkins `OpenShift3 Plugin
- `_
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `.
:arg str api-url: this would be the value you specify if you leverage the
--server option on the OpenShift `oc` command.
@@ -2469,6 +2469,8 @@ def openshift_build_verify(parser, xml_parent, data):
"namespace", that is the value you want to put here. (default 'test')
:arg str auth-token: The value here is what you supply with the --token
option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
Full Example:
@@ -2483,14 +2485,15 @@ def openshift_build_verify(parser, xml_parent, data):
:language: yaml
"""
osb = XML.SubElement(xml_parent,
- 'com.openshift.'
- 'openshiftjenkinsbuildutils.OpenShiftBuildVerifier')
+ 'com.openshift.jenkins.plugins.pipeline.'
+ 'OpenShiftBuildVerifier')
mapping = [
# option, xml name, default value
("api-url", 'apiURL', 'https://openshift.default.svc.cluster.local'),
("bld-cfg", 'bldCfg', 'frontend'),
("namespace", 'namespace', 'test'),
("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', 'false'),
]
convert_mapping_to_xml(osb, data, mapping)
@@ -2499,8 +2502,8 @@ def openshift_build_verify(parser, xml_parent, data):
def openshift_builder(parser, xml_parent, data):
"""yaml: openshift-builder
Perform builds in OpenShift for the job.
- Requires the Jenkins `OpenShift3 Plugin
- `_
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `.
:arg str api-url: this would be the value you specify if you leverage the
--server option on the OpenShift `oc` command.
@@ -2512,8 +2515,17 @@ def openshift_builder(parser, xml_parent, data):
"namespace", that is the value you want to put here. (default 'test')
:arg str auth-token: The value here is what you supply with the --token
option when invoking the OpenShift `oc` command. (optional)
- :arg bool follow-log: The equivalent of using the --follow option with the
- `oc start-build` command. (default true)
+ :arg str commit-ID: The value here is what you supply with the
+ --commit option when invoking the
+ OpenShift `oc start-build` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
+ :arg str build-name: TThe value here is what you supply with the
+ --from-build option when invoking the
+ OpenShift `oc start-build` command. (optional)
+ :arg str show-build-logs: Indicates whether the build logs get dumped
+ to the console of the Jenkins build. (default 'false')
+
Full Example:
@@ -2526,8 +2538,8 @@ def openshift_builder(parser, xml_parent, data):
:language: yaml
"""
osb = XML.SubElement(xml_parent,
- 'com.openshift.'
- 'openshiftjenkinsbuildutils.OpenShiftBuilder')
+ 'com.openshift.jenkins.plugins.pipeline.'
+ 'OpenShiftBuilder')
mapping = [
# option, xml name, default value
@@ -2535,7 +2547,58 @@ def openshift_builder(parser, xml_parent, data):
("bld-cfg", 'bldCfg', 'frontend'),
("namespace", 'namespace', 'test'),
("auth-token", 'authToken', ''),
- ("follow-log", 'followLog', 'true'),
+ ("commit-ID", 'commitID', ''),
+ ("verbose", 'verbose', 'false'),
+ ("build-name", 'buildName', ''),
+ ("show-build-logs", 'showBuildLogs', 'false'),
+ ]
+
+ convert_mapping_to_xml(osb, data, mapping)
+
+
+def openshift_creator(parser, xml_parent, data):
+ """yaml: openshift-creator
+ Performs the equivalent of an oc create command invocation;
+ this build step takes in the provided JSON or YAML text, and if it
+ conforms to OpenShift schema, creates whichever
+ OpenShift resources are specified.
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `.
+
+ :arg str api-url: this would be the value you specify if you leverage the
+ --server option on the OpenShift `oc` command.
+ (default '\https://openshift.default.svc.cluster.local')
+ :arg str jsonyaml: The JSON or YAML formatted text that conforms to
+ the schema for defining the various OpenShift resources. (optional)
+ :arg str namespace: If you run `oc get bc` for the project listed in
+ "namespace", that is the value you want to put here. (default 'test')
+ :arg str auth-token: The value here is what you supply with the --token
+ option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
+
+ Full Example:
+
+ .. literalinclude::
+ ../../tests/builders/fixtures/openshift-creator001.yaml
+ :language: yaml
+
+ Minimal Example:
+
+ .. literalinclude::
+ ../../tests/builders/fixtures/openshift-creator002.yaml
+ :language: yaml
+ """
+ osb = XML.SubElement(xml_parent,
+ 'com.openshift.jenkins.plugins.pipeline.'
+ 'OpenShiftCreator')
+ mapping = [
+ # option, xml name, default value
+ ("api-url", 'apiURL', 'https://openshift.default.svc.cluster.local'),
+ ("jsonyaml", 'jsonyaml', ''),
+ ("namespace", 'namespace', 'test'),
+ ("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', 'false'),
]
convert_mapping_to_xml(osb, data, mapping)
@@ -2546,8 +2609,8 @@ def openshift_dep_verify(parser, xml_parent, data):
Determines whether the expected set of DeploymentConfig's,
ReplicationController's, and active replicas are present based on prior
use of the scaler (2) and deployer (3) steps
- Requires the Jenkins `OpenShift3 Plugin
- `_
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `._
:arg str api-url: this would be the value you specify if you leverage the
--server option on the OpenShift `oc` command.
@@ -2561,6 +2624,8 @@ def openshift_dep_verify(parser, xml_parent, data):
of pods you want started for the deployment. (default 0)
:arg str auth-token: The value here is what you supply with the --token
option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
Full Example:
@@ -2575,8 +2640,7 @@ def openshift_dep_verify(parser, xml_parent, data):
:language: yaml
"""
osb = XML.SubElement(xml_parent,
- 'com.openshift.'
- 'openshiftjenkinsbuildutils.'
+ 'com.openshift.jenkins.plugins.pipeline.'
'OpenShiftDeploymentVerifier')
mapping = [
@@ -2586,6 +2650,7 @@ def openshift_dep_verify(parser, xml_parent, data):
("namespace", 'namespace', 'test'),
("replica-count", 'replicaCount', 0),
("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', 'false'),
]
convert_mapping_to_xml(osb, data, mapping)
@@ -2594,8 +2659,8 @@ def openshift_dep_verify(parser, xml_parent, data):
def openshift_deployer(parser, xml_parent, data):
"""yaml: openshift-deployer
Start a deployment in OpenShift for the job.
- Requires the Jenkins `OpenShift3 Plugin
- `_
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `.
:arg str api-url: this would be the value you specify if you leverage the
--server option on the OpenShift `oc` command.
@@ -2607,6 +2672,8 @@ def openshift_deployer(parser, xml_parent, data):
"namespace", that is the value you want to put here. (default 'test')
:arg str auth-token: The value here is what you supply with the --token
option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
Full Example:
@@ -2621,8 +2688,8 @@ def openshift_deployer(parser, xml_parent, data):
:language: yaml
"""
osb = XML.SubElement(xml_parent,
- 'com.openshift.'
- 'openshiftjenkinsbuildutils.OpenShiftDeployer')
+ 'com.openshift.jenkins.plugins.pipeline.'
+ 'OpenShiftDeployer')
mapping = [
# option, xml name, default value
@@ -2630,6 +2697,7 @@ def openshift_deployer(parser, xml_parent, data):
("dep-cfg", 'depCfg', 'frontend'),
("namespace", 'namespace', 'test'),
("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', 'false'),
]
convert_mapping_to_xml(osb, data, mapping)
@@ -2639,8 +2707,8 @@ def openshift_img_tagger(parser, xml_parent, data):
"""yaml: openshift-img-tagger
Performs the equivalent of an oc tag command invocation in order to
manipulate tags for images in OpenShift ImageStream's
- Requires the Jenkins `OpenShift3 Plugin
- `_
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `.
:arg str api-url: this would be the value you specify if you leverage the
--server option on the OpenShift `oc` command.
@@ -2655,6 +2723,8 @@ def openshift_img_tagger(parser, xml_parent, data):
"namespace", that is the value you want to put here. (default 'test')
:arg str auth-token: The value here is what you supply with the --token
option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
Full Example:
@@ -2669,8 +2739,8 @@ def openshift_img_tagger(parser, xml_parent, data):
:language: yaml
"""
osb = XML.SubElement(xml_parent,
- 'com.openshift.'
- 'openshiftjenkinsbuildutils.OpenShiftImageTagger')
+ 'com.openshift.jenkins.plugins.pipeline.'
+ 'OpenShiftImageTagger')
mapping = [
# option, xml name, default value
@@ -2679,6 +2749,7 @@ def openshift_img_tagger(parser, xml_parent, data):
("prod-tag", 'prodTag', 'origin-nodejs-sample:prod'),
("namespace", 'namespace', 'test'),
("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', 'false'),
]
convert_mapping_to_xml(osb, data, mapping)
@@ -2687,8 +2758,8 @@ def openshift_img_tagger(parser, xml_parent, data):
def openshift_scaler(parser, xml_parent, data):
"""yaml: openshift-scaler
Scale deployments in OpenShift for the job.
- Requires the Jenkins `OpenShift3 Plugin
- `_
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `.
:arg str api-url: this would be the value you specify if you leverage the
--server option on the OpenShift `oc` command.
@@ -2702,6 +2773,8 @@ def openshift_scaler(parser, xml_parent, data):
of pods you want started for the deployment. (default 0)
:arg str auth-token: The value here is what you supply with the --token
option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
Full Example:
@@ -2714,8 +2787,8 @@ def openshift_scaler(parser, xml_parent, data):
:language: yaml
"""
osb = XML.SubElement(xml_parent,
- 'com.openshift.'
- 'openshiftjenkinsbuildutils.OpenShiftScaler')
+ 'com.openshift.jenkins.plugins.pipeline.'
+ 'OpenShiftScaler')
mapping = [
# option, xml name, default value
@@ -2724,6 +2797,7 @@ def openshift_scaler(parser, xml_parent, data):
("namespace", 'namespace', 'test'),
("replica-count", 'replicaCount', 0),
("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', 'false'),
]
convert_mapping_to_xml(osb, data, mapping)
@@ -2732,8 +2806,8 @@ def openshift_scaler(parser, xml_parent, data):
def openshift_svc_verify(parser, xml_parent, data):
"""yaml: openshift-svc-verify
Verify a service is up in OpenShift for the job.
- Requires the Jenkins `OpenShift3 Plugin
- `_
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `.
:arg str api-url: this would be the value you specify if you leverage the
--server option on the OpenShift `oc` command.
@@ -2744,6 +2818,8 @@ def openshift_svc_verify(parser, xml_parent, data):
"namespace", that is the value you want to put here. (default 'test')
:arg str auth-token: The value here is what you supply with the --token
option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
Full Example:
@@ -2758,8 +2834,8 @@ def openshift_svc_verify(parser, xml_parent, data):
:language: yaml
"""
osb = XML.SubElement(xml_parent,
- 'com.openshift.'
- 'openshiftjenkinsbuildutils.OpenShiftServiceVerifier')
+ 'com.openshift.jenkins.plugins.pipeline.'
+ 'OpenShiftServiceVerifier')
mapping = [
# option, xml name, default value
@@ -2767,6 +2843,7 @@ def openshift_svc_verify(parser, xml_parent, data):
("svc-name", 'svcName', 'frontend'),
("namespace", 'namespace', 'test'),
("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', 'false'),
]
convert_mapping_to_xml(osb, data, mapping)
diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py
index 298decc85..1af2e2251 100644
--- a/jenkins_jobs/modules/publishers.py
+++ b/jenkins_jobs/modules/publishers.py
@@ -37,6 +37,7 @@ from jenkins_jobs.errors import InvalidAttributeError
from jenkins_jobs.errors import JenkinsJobsException
from jenkins_jobs.errors import MissingAttributeError
import jenkins_jobs.modules.base
+from jenkins_jobs.modules import hudson_model
from jenkins_jobs.modules.helpers import artifactory_common_details
from jenkins_jobs.modules.helpers import artifactory_deployment_patterns
from jenkins_jobs.modules.helpers import artifactory_env_vars_patterns
@@ -48,7 +49,7 @@ from jenkins_jobs.modules.helpers import cloudformation_stack
from jenkins_jobs.modules.helpers import config_file_provider_settings
from jenkins_jobs.modules.helpers import findbugs_settings
from jenkins_jobs.modules.helpers import get_value_from_yaml_or_config_file
-from jenkins_jobs.modules import hudson_model
+from jenkins_jobs.modules.helpers import convert_mapping_to_xml
def archive(parser, xml_parent, data):
@@ -5561,6 +5562,107 @@ def phabricator(parser, xml_parent, data):
data.get('comment-with-console-link-on-failure')).lower()
+def openshift_build_canceller(parser, xml_parent, data):
+ """yaml: openshift-build-canceller
+ This action is intended to provide cleanup for a Jenkins job which failed
+ because a build is hung (instead of terminating with a failure code);
+ this step will allow you to perform the equivalent of a oc cancel-build
+ for the provided build config; any builds under that build config which
+ are not previously terminated (either successfully or unsuccessfully)
+ or cancelled will be cancelled.
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `.
+
+ :arg str api-url: this would be the value you specify if you leverage the
+ --server option on the OpenShift `oc` command.
+ (default '\https://openshift.default.svc.cluster.local')
+ :arg str bld-cfg: The value here should be whatever was the output
+ form `oc project` when you created the BuildConfig you
+ want to run a Build on (default 'frontend')
+ :arg str namespace: If you run `oc get bc` for the project listed in
+ "namespace", that is the value you want to put here. (default 'test')
+ :arg str auth-token: The value here is what you supply with the --token
+ option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
+
+ Full Example:
+
+ .. literalinclude::
+ ../../tests/publishers/fixtures/openshift-build-canceller001.yaml
+ :language: yaml
+
+ Minimal Example:
+
+ .. literalinclude::
+ ../../tests/publishers/fixtures/openshift-build-canceller002.yaml
+ :language: yaml
+ """
+
+ osb = XML.SubElement(xml_parent,
+ 'com.openshift.jenkins.plugins.pipeline.'
+ 'OpenShiftBuildCanceller')
+ mapping = [
+ # option, xml name, default value
+ ("api-url", 'apiURL', 'https://openshift.default.svc.cluster.local'),
+ ("bld-cfg", 'bldCfg', 'frontend'),
+ ("namespace", 'namespace', 'test'),
+ ("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', 'false'),
+ ]
+
+ convert_mapping_to_xml(osb, data, mapping)
+
+
+def openshift_deploy_canceller(parser, xml_parent, data):
+ """yaml: openshift-deploy-canceller
+ This action is intended to provide cleanup for any OpenShift deployments
+ left running when the Job completes; this step will allow you to perform
+ the equivalent of a oc deploy --cancel for the provided deployment config.
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `.
+
+ :arg str api-url: this would be the value you specify if you leverage the
+ --server option on the OpenShift `oc` command.
+ (default '\https://openshift.default.svc.cluster.local')
+ :arg str dep-cfg: The value here should be whatever was the output
+ form `oc project` when you created the BuildConfig you want to run a
+ Build on (default frontend)
+ :arg str namespace: If you run `oc get bc` for the project listed in
+ "namespace", that is the value you want to put here. (default 'test')
+ :arg str auth-token: The value here is what you supply with the --token
+ option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (default 'false')
+
+ Full Example:
+
+ .. literalinclude::
+ ../../tests/publishers/fixtures/openshift-deploy-canceller001.yaml
+ :language: yaml
+
+ Minimal Example:
+
+ .. literalinclude::
+ ../../tests/publishers/fixtures/openshift-deploy-canceller002.yaml
+ :language: yaml
+ """
+
+ osb = XML.SubElement(xml_parent,
+ 'com.openshift.jenkins.plugins.pipeline.'
+ 'OpenShiftDeployCanceller')
+ mapping = [
+ # option, xml name, default value
+ ("api-url", 'apiURL', 'https://openshift.default.svc.cluster.local'),
+ ("dep-cfg", 'depCfg', 'frontend'),
+ ("namespace", 'namespace', 'test'),
+ ("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', 'false'),
+ ]
+
+ convert_mapping_to_xml(osb, data, mapping)
+
+
class Publishers(jenkins_jobs.modules.base.Base):
sequence = 70
diff --git a/jenkins_jobs/modules/scm.py b/jenkins_jobs/modules/scm.py
index 07eb414cc..a25f5d3dc 100644
--- a/jenkins_jobs/modules/scm.py
+++ b/jenkins_jobs/modules/scm.py
@@ -1058,8 +1058,8 @@ def openshift_img_streams(parser, xml_parent, data):
OpenShift ImageStreams (which are abstractions of Docker repositories)
and SCMs - versions / commit IDs of related artifacts
(images vs. programmatics files)
- Requires the Jenkins `OpenShift3 Plugin
- `_
+ Requires the Jenkins :jenkins-wiki:`OpenShift
+ Pipeline Plugin `._
:arg str image-stream-name: The name of the ImageStream is what shows up
in the NAME column if you dump all the ImageStream's with the
@@ -1074,6 +1074,8 @@ def openshift_img_streams(parser, xml_parent, data):
a Build on. (default: test)
:arg str auth-token: The value here is what you supply with the --token
option when invoking the OpenShift `oc` command. (optional)
+ :arg str verbose: This flag is the toggle for
+ turning on or off detailed logging in this plug-in. (optional)
Full Example:
@@ -1089,7 +1091,7 @@ def openshift_img_streams(parser, xml_parent, data):
"""
scm = XML.SubElement(xml_parent,
'scm', {'class':
- 'com.openshift.openshiftjenkinsbuildutils.'
+ 'com.openshift.jenkins.plugins.pipeline.'
'OpenShiftImageStreams'})
mapping = [
# option, xml name, default value
@@ -1098,6 +1100,7 @@ def openshift_img_streams(parser, xml_parent, data):
("api-url", 'apiURL', 'https://openshift.default.svc.cluster.local'),
("namespace", 'namespace', 'test'),
("auth-token", 'authToken', ''),
+ ("verbose", 'verbose', ''),
]
convert_mapping_to_xml(scm, data, mapping)
diff --git a/tests/builders/fixtures/openshift-build-verify001.xml b/tests/builders/fixtures/openshift-build-verify001.xml
index 8dbf921b1..fec751576 100644
--- a/tests/builders/fixtures/openshift-build-verify001.xml
+++ b/tests/builders/fixtures/openshift-build-verify001.xml
@@ -1,11 +1,12 @@
-
+
https://openshift.example.local.url/
front
test-build
ose-key-buildv1
-
+ true
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-build-verify001.yaml b/tests/builders/fixtures/openshift-build-verify001.yaml
index 6fc2ad953..6835a193c 100644
--- a/tests/builders/fixtures/openshift-build-verify001.yaml
+++ b/tests/builders/fixtures/openshift-build-verify001.yaml
@@ -3,4 +3,5 @@ builders:
api-url: https://openshift.example.local.url/
bld-cfg: front
namespace: test-build
- auth-token: ose-key-buildv1
\ No newline at end of file
+ auth-token: ose-key-buildv1
+ verbose: true
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-build-verify002.xml b/tests/builders/fixtures/openshift-build-verify002.xml
index 29e6a6956..b28b39479 100644
--- a/tests/builders/fixtures/openshift-build-verify002.xml
+++ b/tests/builders/fixtures/openshift-build-verify002.xml
@@ -1,11 +1,12 @@
-
+
https://openshift.default.svc.cluster.local
frontend
test
-
+ false
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-builder001.xml b/tests/builders/fixtures/openshift-builder001.xml
index 858e108f1..3c15f5340 100644
--- a/tests/builders/fixtures/openshift-builder001.xml
+++ b/tests/builders/fixtures/openshift-builder001.xml
@@ -1,12 +1,15 @@
-
+
https://openshift.example.local.url/
front
test9
ose-builder1
- false
-
+ ae489f7d
+ true
+ ose-test-build
+ true
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-builder001.yaml b/tests/builders/fixtures/openshift-builder001.yaml
index 995c8926d..4c11e2c46 100644
--- a/tests/builders/fixtures/openshift-builder001.yaml
+++ b/tests/builders/fixtures/openshift-builder001.yaml
@@ -4,4 +4,7 @@ builders:
bld-cfg: front
namespace: test9
auth-token: ose-builder1
- follow-log: false
\ No newline at end of file
+ commit-ID: ae489f7d
+ verbose: true
+ build-name: ose-test-build
+ show-build-logs: true
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-builder002.xml b/tests/builders/fixtures/openshift-builder002.xml
index 04d269bf6..c9899ebe0 100644
--- a/tests/builders/fixtures/openshift-builder002.xml
+++ b/tests/builders/fixtures/openshift-builder002.xml
@@ -1,12 +1,15 @@
-
+
https://openshift.default.svc.cluster.local
frontend
test
- true
-
+
+ false
+
+ false
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-creator001.xml b/tests/builders/fixtures/openshift-creator001.xml
new file mode 100644
index 000000000..32b2d4b64
--- /dev/null
+++ b/tests/builders/fixtures/openshift-creator001.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ https://openshift.example.local.url/
+ front: back
+ test6
+ ose-key-creator1
+ true
+
+
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-creator001.yaml b/tests/builders/fixtures/openshift-creator001.yaml
new file mode 100644
index 000000000..262c0eb7c
--- /dev/null
+++ b/tests/builders/fixtures/openshift-creator001.yaml
@@ -0,0 +1,7 @@
+builders:
+ - openshift-creator:
+ api-url: https://openshift.example.local.url/
+ jsonyaml: 'front: back'
+ namespace: test6
+ auth-token: ose-key-creator1
+ verbose: true
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-creator002.xml b/tests/builders/fixtures/openshift-creator002.xml
new file mode 100644
index 000000000..8c1a04ec0
--- /dev/null
+++ b/tests/builders/fixtures/openshift-creator002.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ https://openshift.default.svc.cluster.local
+
+ test
+
+ false
+
+
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-creator002.yaml b/tests/builders/fixtures/openshift-creator002.yaml
new file mode 100644
index 000000000..7972b4857
--- /dev/null
+++ b/tests/builders/fixtures/openshift-creator002.yaml
@@ -0,0 +1,2 @@
+builders:
+ - openshift-creator
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-dep-verify001.xml b/tests/builders/fixtures/openshift-dep-verify001.xml
index bb4af7a46..5f47cc6ad 100644
--- a/tests/builders/fixtures/openshift-dep-verify001.xml
+++ b/tests/builders/fixtures/openshift-dep-verify001.xml
@@ -1,12 +1,13 @@
-
+
https://openshift.example.local.url/
front
test6
4
ose-key-dep-verify1
-
+ true
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-dep-verify001.yaml b/tests/builders/fixtures/openshift-dep-verify001.yaml
index 21e5fe300..db666e790 100644
--- a/tests/builders/fixtures/openshift-dep-verify001.yaml
+++ b/tests/builders/fixtures/openshift-dep-verify001.yaml
@@ -4,4 +4,5 @@ builders:
dep-cfg: front
namespace: test6
replica-count: 4
- auth-token: ose-key-dep-verify1
\ No newline at end of file
+ auth-token: ose-key-dep-verify1
+ verbose: true
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-dep-verify002.xml b/tests/builders/fixtures/openshift-dep-verify002.xml
index 43cada066..1dcc12693 100644
--- a/tests/builders/fixtures/openshift-dep-verify002.xml
+++ b/tests/builders/fixtures/openshift-dep-verify002.xml
@@ -1,12 +1,13 @@
-
+
https://openshift.default.svc.cluster.local
frontend
test
0
-
+ false
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-deployer001.xml b/tests/builders/fixtures/openshift-deployer001.xml
index cf1838864..f8628caf2 100644
--- a/tests/builders/fixtures/openshift-deployer001.xml
+++ b/tests/builders/fixtures/openshift-deployer001.xml
@@ -1,11 +1,12 @@
-
+
https://openshift.example.local.url/
front
test3
ose-key-deployer1
-
+ true
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-deployer001.yaml b/tests/builders/fixtures/openshift-deployer001.yaml
index e0c2d8217..fb442c07f 100644
--- a/tests/builders/fixtures/openshift-deployer001.yaml
+++ b/tests/builders/fixtures/openshift-deployer001.yaml
@@ -3,4 +3,5 @@ builders:
api-url: https://openshift.example.local.url/
dep-cfg: front
namespace: test3
- auth-token: ose-key-deployer1
\ No newline at end of file
+ auth-token: ose-key-deployer1
+ verbose: true
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-deployer002.xml b/tests/builders/fixtures/openshift-deployer002.xml
index d0e48dfcd..227b4addd 100644
--- a/tests/builders/fixtures/openshift-deployer002.xml
+++ b/tests/builders/fixtures/openshift-deployer002.xml
@@ -1,11 +1,12 @@
-
+
https://openshift.default.svc.cluster.local
frontend
test
-
+ false
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-img-tagger001.xml b/tests/builders/fixtures/openshift-img-tagger001.xml
index 69b21ba65..4182a1c7b 100644
--- a/tests/builders/fixtures/openshift-img-tagger001.xml
+++ b/tests/builders/fixtures/openshift-img-tagger001.xml
@@ -1,12 +1,13 @@
-
+
https://openshift.example.local.url/
origin-nodejs-sample:test
origin-nodejs-sample:production
test5
ose-key-img1
-
+ true
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-img-tagger001.yaml b/tests/builders/fixtures/openshift-img-tagger001.yaml
index d5e066759..34b827631 100644
--- a/tests/builders/fixtures/openshift-img-tagger001.yaml
+++ b/tests/builders/fixtures/openshift-img-tagger001.yaml
@@ -4,4 +4,5 @@ builders:
test-tag: origin-nodejs-sample:test
prod-tag: origin-nodejs-sample:production
namespace: test5
- auth-token: ose-key-img1
\ No newline at end of file
+ auth-token: ose-key-img1
+ verbose: true
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-img-tagger002.xml b/tests/builders/fixtures/openshift-img-tagger002.xml
index 6306e3d3c..566586903 100644
--- a/tests/builders/fixtures/openshift-img-tagger002.xml
+++ b/tests/builders/fixtures/openshift-img-tagger002.xml
@@ -1,12 +1,13 @@
-
+
https://openshift.default.svc.cluster.local
origin-nodejs-sample:latest
origin-nodejs-sample:prod
test
-
+ false
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-scaler001.xml b/tests/builders/fixtures/openshift-scaler001.xml
index 7311569d9..87dd3098c 100644
--- a/tests/builders/fixtures/openshift-scaler001.xml
+++ b/tests/builders/fixtures/openshift-scaler001.xml
@@ -1,12 +1,13 @@
-
+
https://openshift.example.local.url/
front
test2
4
ose-key-scaler1
-
+ true
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-scaler001.yaml b/tests/builders/fixtures/openshift-scaler001.yaml
index f3b18c8e2..d480b65e1 100644
--- a/tests/builders/fixtures/openshift-scaler001.yaml
+++ b/tests/builders/fixtures/openshift-scaler001.yaml
@@ -4,4 +4,5 @@ builders:
dep-cfg: front
namespace: test2
replica-count: 4
- auth-token: ose-key-scaler1
\ No newline at end of file
+ auth-token: ose-key-scaler1
+ verbose: true
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-scaler002.xml b/tests/builders/fixtures/openshift-scaler002.xml
index 34b5d252d..25c58c46b 100644
--- a/tests/builders/fixtures/openshift-scaler002.xml
+++ b/tests/builders/fixtures/openshift-scaler002.xml
@@ -1,12 +1,13 @@
-
+
https://openshift.default.svc.cluster.local
frontend
test
0
-
+ false
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-svc-verify001.xml b/tests/builders/fixtures/openshift-svc-verify001.xml
index cc6bde73a..785e81d20 100644
--- a/tests/builders/fixtures/openshift-svc-verify001.xml
+++ b/tests/builders/fixtures/openshift-svc-verify001.xml
@@ -1,11 +1,12 @@
-
+
https://openshift.example.local.url/
front
test4
ose-key-svc-verify1
-
+ true
+
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-svc-verify001.yaml b/tests/builders/fixtures/openshift-svc-verify001.yaml
index 0e639cf4e..f17aac3f4 100644
--- a/tests/builders/fixtures/openshift-svc-verify001.yaml
+++ b/tests/builders/fixtures/openshift-svc-verify001.yaml
@@ -3,4 +3,5 @@ builders:
api-url: https://openshift.example.local.url/
svc-name: front
namespace: test4
- auth-token: ose-key-svc-verify1
\ No newline at end of file
+ auth-token: ose-key-svc-verify1
+ verbose: true
\ No newline at end of file
diff --git a/tests/builders/fixtures/openshift-svc-verify002.xml b/tests/builders/fixtures/openshift-svc-verify002.xml
index 5138fe01e..dadf4584e 100644
--- a/tests/builders/fixtures/openshift-svc-verify002.xml
+++ b/tests/builders/fixtures/openshift-svc-verify002.xml
@@ -1,11 +1,12 @@
-
+
https://openshift.default.svc.cluster.local
frontend
test
-
+ false
+
\ No newline at end of file
diff --git a/tests/publishers/fixtures/openshift-build-canceller001.xml b/tests/publishers/fixtures/openshift-build-canceller001.xml
new file mode 100644
index 000000000..37a38645b
--- /dev/null
+++ b/tests/publishers/fixtures/openshift-build-canceller001.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ https://openshift.example.local.url/
+ front
+ test-build
+ ose-key-canceller1
+ true
+
+
+
\ No newline at end of file
diff --git a/tests/publishers/fixtures/openshift-build-canceller001.yaml b/tests/publishers/fixtures/openshift-build-canceller001.yaml
new file mode 100644
index 000000000..e9f379ab4
--- /dev/null
+++ b/tests/publishers/fixtures/openshift-build-canceller001.yaml
@@ -0,0 +1,7 @@
+publishers:
+ - openshift-build-canceller:
+ api-url: https://openshift.example.local.url/
+ bld-cfg: front
+ namespace: test-build
+ auth-token: ose-key-canceller1
+ verbose: true
\ No newline at end of file
diff --git a/tests/publishers/fixtures/openshift-build-canceller002.xml b/tests/publishers/fixtures/openshift-build-canceller002.xml
new file mode 100644
index 000000000..1a1c1af74
--- /dev/null
+++ b/tests/publishers/fixtures/openshift-build-canceller002.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ https://openshift.default.svc.cluster.local
+ frontend
+ test
+
+ false
+
+
+
\ No newline at end of file
diff --git a/tests/publishers/fixtures/openshift-build-canceller002.yaml b/tests/publishers/fixtures/openshift-build-canceller002.yaml
new file mode 100644
index 000000000..d45dcaf73
--- /dev/null
+++ b/tests/publishers/fixtures/openshift-build-canceller002.yaml
@@ -0,0 +1,2 @@
+publishers:
+ - openshift-build-canceller
\ No newline at end of file
diff --git a/tests/publishers/fixtures/openshift-deploy-canceller001.xml b/tests/publishers/fixtures/openshift-deploy-canceller001.xml
new file mode 100644
index 000000000..7cb04cbef
--- /dev/null
+++ b/tests/publishers/fixtures/openshift-deploy-canceller001.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ https://openshift.example.local.url/
+ front
+ test6
+ ose-key-dep-canceller1
+ true
+
+
+
\ No newline at end of file
diff --git a/tests/publishers/fixtures/openshift-deploy-canceller001.yaml b/tests/publishers/fixtures/openshift-deploy-canceller001.yaml
new file mode 100644
index 000000000..820d12293
--- /dev/null
+++ b/tests/publishers/fixtures/openshift-deploy-canceller001.yaml
@@ -0,0 +1,7 @@
+publishers:
+ - openshift-deploy-canceller:
+ api-url: https://openshift.example.local.url/
+ dep-cfg: front
+ namespace: test6
+ auth-token: ose-key-dep-canceller1
+ verbose: true
\ No newline at end of file
diff --git a/tests/publishers/fixtures/openshift-deploy-canceller002.xml b/tests/publishers/fixtures/openshift-deploy-canceller002.xml
new file mode 100644
index 000000000..001c0276d
--- /dev/null
+++ b/tests/publishers/fixtures/openshift-deploy-canceller002.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ https://openshift.default.svc.cluster.local
+ frontend
+ test
+
+ false
+
+
+
\ No newline at end of file
diff --git a/tests/publishers/fixtures/openshift-deploy-canceller002.yaml b/tests/publishers/fixtures/openshift-deploy-canceller002.yaml
new file mode 100644
index 000000000..246756ad4
--- /dev/null
+++ b/tests/publishers/fixtures/openshift-deploy-canceller002.yaml
@@ -0,0 +1,2 @@
+publishers:
+ - openshift-deploy-canceller
\ No newline at end of file
diff --git a/tests/scm/fixtures/openshift-img-streams001.xml b/tests/scm/fixtures/openshift-img-streams001.xml
index 3de3781de..612feee56 100644
--- a/tests/scm/fixtures/openshift-img-streams001.xml
+++ b/tests/scm/fixtures/openshift-img-streams001.xml
@@ -1,10 +1,11 @@
-
+
nodejs-010-fedora
prod
https://openshift.example.local.url/
test-scm
ose-key-img-streams1
+ true
\ No newline at end of file
diff --git a/tests/scm/fixtures/openshift-img-streams001.yaml b/tests/scm/fixtures/openshift-img-streams001.yaml
index b8da278b7..8120e4b23 100644
--- a/tests/scm/fixtures/openshift-img-streams001.yaml
+++ b/tests/scm/fixtures/openshift-img-streams001.yaml
@@ -4,4 +4,5 @@ scm:
tag: prod
api-url: https://openshift.example.local.url/
namespace: test-scm
- auth-token: ose-key-img-streams1
\ No newline at end of file
+ auth-token: ose-key-img-streams1
+ verbose: true
\ No newline at end of file
diff --git a/tests/scm/fixtures/openshift-img-streams002.xml b/tests/scm/fixtures/openshift-img-streams002.xml
index 2bc0d3cf8..28e36cc3a 100644
--- a/tests/scm/fixtures/openshift-img-streams002.xml
+++ b/tests/scm/fixtures/openshift-img-streams002.xml
@@ -1,10 +1,11 @@
-
+
nodejs-010-centos7
latest
https://openshift.default.svc.cluster.local
test
+
\ No newline at end of file