Merge "Add support for two new plugins, and a new version of one"

15 files changed, 213 insertions, 0 deletions

diff --git a/tests/general/fixtures/matrix-axis-p4-strategy-file.xml b/tests/general/fixtures/matrix-axis-p4-strategy-file.xml
new file mode 100644
index 00000000..de485efa
--- /dev/null
+++ b/tests/general/fixtures/matrix-axis-p4-strategy-file.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<matrix-project>
+  <executionStrategy class="org.jenkinsci.plugins.p4.matrix.MatrixOptions">
+    <runSequentially>false</runSequentially>
+    <buildParent>false</buildParent>
+  </executionStrategy>
+  <axes/>
+  <actions/>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+</matrix-project>
diff --git a/tests/general/fixtures/matrix-axis-p4-strategy-file.yaml b/tests/general/fixtures/matrix-axis-p4-strategy-file.yaml
new file mode 100644
index 00000000..3fd84a21
--- /dev/null
+++ b/tests/general/fixtures/matrix-axis-p4-strategy-file.yaml
@@ -0,0 +1,4 @@
+project-type: matrix
+p4-strategy:
+  sequential: false
+  build-parent: false
diff --git a/tests/properties/fixtures/priority_sorter003.plugins_info.yaml b/tests/properties/fixtures/priority_sorter003.plugins_info.yaml
new file mode 100644
index 00000000..2d581816
--- /dev/null
+++ b/tests/properties/fixtures/priority_sorter003.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Jenkins Priority Sorter Plugin'
+  shortName: 'PrioritySorter'
+  version: '3.0'
diff --git a/tests/properties/fixtures/priority_sorter003.xml b/tests/properties/fixtures/priority_sorter003.xml
new file mode 100644
index 00000000..876ff7b5
--- /dev/null
+++ b/tests/properties/fixtures/priority_sorter003.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <properties>
+    <jenkins.advancedqueue.jobinclusion.strategy.JobInclusionJobProperty>
+      <useJobGroup>true</useJobGroup>
+      <jobGroupName>Priority 3</jobGroupName>
+    </jenkins.advancedqueue.jobinclusion.strategy.JobInclusionJobProperty>
+  </properties>
+</project>
diff --git a/tests/properties/fixtures/priority_sorter003.yaml b/tests/properties/fixtures/priority_sorter003.yaml
new file mode 100644
index 00000000..9153de67
--- /dev/null
+++ b/tests/properties/fixtures/priority_sorter003.yaml
@@ -0,0 +1,3 @@
+properties:
+  - priority-sorter:
+      priority: Priority 3
diff --git a/tests/publishers/fixtures/influxdb-full.xml b/tests/publishers/fixtures/influxdb-full.xml
new file mode 100644
index 00000000..b08e0bfd
--- /dev/null
+++ b/tests/publishers/fixtures/influxdb-full.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <publishers>
+    <jenkinsci.plugins.influxdb.InfluxDbPublisher plugin="influx-db">
+      <selectedTarget>selectedtarget</selectedTarget>
+      <customProjectName>customprojectname</customProjectName>
+      <customPrefix>customprefix</customPrefix>
+      <jenkinsEnvParameterField>jenkinsenvparameterfield</jenkinsEnvParameterField>
+      <jenkinsEnvParameterTag>jenkinsenvparametertag</jenkinsEnvParameterTag>
+    </jenkinsci.plugins.influxdb.InfluxDbPublisher>
+  </publishers>
+</project>
diff --git a/tests/publishers/fixtures/influxdb-full.yaml b/tests/publishers/fixtures/influxdb-full.yaml
new file mode 100644
index 00000000..219c5d47
--- /dev/null
+++ b/tests/publishers/fixtures/influxdb-full.yaml
@@ -0,0 +1,7 @@
+publishers:
+  - influx-db:
+      selected-target: selectedtarget
+      custom-project-name: customprojectname
+      custom-prefix: customprefix
+      jenkins-env-parameter-field: jenkinsenvparameterfield
+      jenkins-env-parameter-tag: jenkinsenvparametertag
diff --git a/tests/publishers/fixtures/influxdb-minimal.xml b/tests/publishers/fixtures/influxdb-minimal.xml
new file mode 100644
index 00000000..1ea806f8
--- /dev/null
+++ b/tests/publishers/fixtures/influxdb-minimal.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <publishers>
+    <jenkinsci.plugins.influxdb.InfluxDbPublisher plugin="influx-db">
+      <selectedTarget>selectedtarget</selectedTarget>
+      <customProjectName/>
+      <customPrefix/>
+      <jenkinsEnvParameterField/>
+      <jenkinsEnvParameterTag/>
+    </jenkinsci.plugins.influxdb.InfluxDbPublisher>
+  </publishers>
+</project>
diff --git a/tests/publishers/fixtures/influxdb-minimal.yaml b/tests/publishers/fixtures/influxdb-minimal.yaml
new file mode 100644
index 00000000..fd5871c0
--- /dev/null
+++ b/tests/publishers/fixtures/influxdb-minimal.yaml
@@ -0,0 +1,3 @@
+publishers:
+  - influx-db:
+      selected-target: selectedtarget
diff --git a/tests/scm/fixtures/p4-001.xml b/tests/scm/fixtures/p4-001.xml
new file mode 100644
index 00000000..30620d74
--- /dev/null
+++ b/tests/scm/fixtures/p4-001.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <scm class="org.jenkinsci.plugins.p4.PerforceScm" plugin="p4">
+    <credential>credential</credential>
+    <workspace class="org.jenkinsci.plugins.p4.workspace.StaticWorkspaceImpl">
+      <charset>none</charset>
+      <pinHost>false</pinHost>
+      <name>workspacename</name>
+    </workspace>
+    <populate class="org.jenkinsci.plugins.p4.populate.SyncOnlyImpl">
+      <have>true</have>
+      <force>false</force>
+      <modtime>false</modtime>
+      <quiet>true</quiet>
+      <pin>populatelabel</pin>
+      <revert>false</revert>
+      <parallel>
+        <enable>false</enable>
+        <threads>4</threads>
+        <minfiles>1</minfiles>
+        <minbytes>1024</minbytes>
+      </parallel>
+    </populate>
+  </scm>
+</project>
diff --git a/tests/scm/fixtures/p4-001.yaml b/tests/scm/fixtures/p4-001.yaml
new file mode 100644
index 00000000..af3aa5f2
--- /dev/null
+++ b/tests/scm/fixtures/p4-001.yaml
@@ -0,0 +1,10 @@
+scm:
+  - p4:
+      credential: credential
+      workspace-type: Static
+      workspace-name: workspacename
+      populate-type: SyncOnly
+      populate-have-list: true
+      populate-quiet: true
+      populate-revert: false
+      populate-label: populatelabel
diff --git a/tests/scm/fixtures/p4-002.xml b/tests/scm/fixtures/p4-002.xml
new file mode 100644
index 00000000..01de2591
--- /dev/null
+++ b/tests/scm/fixtures/p4-002.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <scm class="org.jenkinsci.plugins.p4.PerforceScm" plugin="p4">
+    <credential>credential</credential>
+    <workspace class="org.jenkinsci.plugins.p4.workspace.ManualWorkspaceImpl">
+      <spec>
+        <allwrite>true</allwrite>
+        <clobber>true</clobber>
+        <compress>true</compress>
+        <locked>true</locked>
+        <modtime>true</modtime>
+        <rmdir>true</rmdir>
+        <line>specline</line>
+        <view>specview</view>
+        <type>spectype</type>
+        <backup>true</backup>
+        <streamName>specstreamname</streamName>
+      </spec>
+      <charset>none</charset>
+      <pinHost>false</pinHost>
+      <name>workspacename</name>
+    </workspace>
+    <populate class="org.jenkinsci.plugins.p4.populate.AutoCleanImpl">
+      <have>true</have>
+      <force>false</force>
+      <modtime>false</modtime>
+      <quiet>true</quiet>
+      <pin>populatelabel</pin>
+      <revert>false</revert>
+      <parallel>
+        <enable>false</enable>
+        <threads>4</threads>
+        <minfiles>1</minfiles>
+        <minbytes>1024</minbytes>
+      </parallel>
+    </populate>
+  </scm>
+</project>
diff --git a/tests/scm/fixtures/p4-002.yaml b/tests/scm/fixtures/p4-002.yaml
new file mode 100644
index 00000000..5c1c32ee
--- /dev/null
+++ b/tests/scm/fixtures/p4-002.yaml
@@ -0,0 +1,21 @@
+scm:
+ - p4:
+     credential: credential
+     workspace-type: Manual
+     workspace-name: workspacename
+     populate-type: AutoClean
+     populate-have-list: True
+     populate-quiet: True
+     populate-revert: False
+     populate-label: populatelabel
+     spec-allwrite: True
+     spec-clobber: True
+     spec-compress: True
+     spec-locked: True
+     spec-modtime: True
+     spec-rmdir: True
+     spec-line: specline
+     spec-view: specview
+     spec-type: spectype
+     spec-backup: True
+     spec-stream-name: specstreamname
diff --git a/tests/scm/fixtures/p4-003.xml b/tests/scm/fixtures/p4-003.xml
new file mode 100644
index 00000000..d5d58d50
--- /dev/null
+++ b/tests/scm/fixtures/p4-003.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <scm class="org.jenkinsci.plugins.p4.PerforceScm" plugin="p4">
+    <credential>credential</credential>
+    <workspace class="org.jenkinsci.plugins.p4.workspace.ManualWorkspaceImpl">
+      <spec>
+        <allwrite>false</allwrite>
+        <clobber>false</clobber>
+        <compress>false</compress>
+        <locked>false</locked>
+        <modtime>false</modtime>
+        <rmdir>false</rmdir>
+        <line/>
+        <view/>
+        <type/>
+        <backup>false</backup>
+        <streamName/>
+      </spec>
+      <charset>none</charset>
+      <pinHost>false</pinHost>
+      <name>workspacename</name>
+    </workspace>
+    <filter>
+      <org.jenkinsci.plugins.p4.filters.FilterViewMaskImpl>
+        <viewMask>viewmask</viewMask>
+      </org.jenkinsci.plugins.p4.filters.FilterViewMaskImpl>
+    </filter>
+    <populate class="org.jenkinsci.plugins.p4.populate.SyncOnlyImpl">
+      <have>false</have>
+      <force>false</force>
+      <modtime>false</modtime>
+      <quiet>false</quiet>
+      <parallel>
+        <enable>true</enable>
+        <threads>2</threads>
+        <minfiles>5</minfiles>
+        <minbytes>500</minbytes>
+      </parallel>
+    </populate>
+  </scm>
+</project>
diff --git a/tests/scm/fixtures/p4-003.yaml b/tests/scm/fixtures/p4-003.yaml
new file mode 100644
index 00000000..cfefeb08
--- /dev/null
+++ b/tests/scm/fixtures/p4-003.yaml
@@ -0,0 +1,11 @@
+scm:
+  - p4:
+      credential: credential
+      workspace-type: Manual
+      workspace-name: workspacename
+      populate-type: SyncOnly
+      view-mask: viewmask
+      parallel-enabled: True
+      parallel-threads: 2
+      parallel-minfiles: 5
+      parallel-minbytes: 500