[JENKINS-46700] Expand zip file for LocalData to avoid JENKINS-47075

jenkinsci · Sep 23, 2017 · 39df7cc · 39df7cc
1 parent ebf8b83
commit 39df7cc
Show file tree

Hide file tree

Showing 15 changed files with 176 additions and 7 deletions.
diff --git a/src/test/java/hudson/plugins/copyartifact/CopyArtifactTest.java b/src/test/java/hudson/plugins/copyartifact/CopyArtifactTest.java
@@ -1006,9 +1006,6 @@ public void testPermissionWhenParameterized() throws Exception {
     @LocalData
     @Test
     public void testPermissionWhenParameterizedForMatrixConfig() throws Exception {
-        // This test fails before Jenkins 1.406
-        if (new VersionNumber("1.406").isNewerThan(Hudson.getVersion())) return; // Skip
-
         FreeStyleProject p = createProject("testMatrix/FOO=$FOO", null, "", "", false, false, false, true);
         ParameterDefinition paramDef = new StringParameterDefinition("FOO", "FOO");
         ParametersDefinitionProperty paramsDef = new ParametersDefinitionProperty(paramDef);
@@ -1021,12 +1018,8 @@ public void testPermissionWhenParameterizedForMatrixConfig() throws Exception {
         rule.assertBuildStatusSuccess(b);
     }
 
-    @LocalData
     @Test
     public void testPermissionWhenParameterizedForMavenModule() throws Exception {
-        // This test fails before Jenkins 1.406
-        if (new VersionNumber("1.406").isNewerThan(Hudson.getVersion())) return; // Skip
-
         MavenModuleSet mp = setupMavenJob();
         mp.addProperty(new AuthorizationMatrixProperty(
                 Collections.singletonMap(Item.READ, Collections.singleton("authenticated"))));

diff --git a/src/test/resources/hudson/plugins/copyartifact/CopyArtifactTest.zip b/src/test/resources/hudson/plugins/copyartifact/CopyArtifactTest.zip
diff --git a/...s/hudson/plugins/copyartifact/CopyArtifactTest/testPermissionWhenParameterized/config.xml b/...s/hudson/plugins/copyartifact/CopyArtifactTest/testPermissionWhenParameterized/config.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson>
+  <version>1.376</version>
+  <numExecutors>1</numExecutors>
+  <mode>NORMAL</mode>
+  <useSecurity>true</useSecurity>
+  <authorizationStrategy class="hudson.security.ProjectMatrixAuthorizationStrategy">
+    <permission>hudson.model.Hudson.Administer:admin</permission>
+    <permission>hudson.model.Hudson.Read:anonymous</permission>
+  </authorizationStrategy>
+  <securityRealm class="hudson.security.HudsonPrivateSecurityRealm">
+    <disableSignup>true</disableSignup>
+  </securityRealm>
+  <jdks/>
+  <slaves/>
+  <quietPeriod>5</quietPeriod>
+</hudson>
diff --git a/...t/testPermissionWhenParameterized/jobs/testJob/builds/2011-02-01_12-00-00/archive/foo.txt b/...t/testPermissionWhenParameterized/jobs/testJob/builds/2011-02-01_12-00-00/archive/foo.txt
@@ -0,0 +1 @@
+bar
diff --git a/...actTest/testPermissionWhenParameterized/jobs/testJob/builds/2011-02-01_12-00-00/build.xml b/...actTest/testPermissionWhenParameterized/jobs/testJob/builds/2011-02-01_12-00-00/build.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<build>
+  <actions/>
+  <number>1</number>
+  <result>SUCCESS</result>
+  <duration>54321</duration>
+  <charset>UTF-8</charset>
+  <keepLog>false</keepLog>
+  <builtOn>master</builtOn>
+  <workspace>/tmp/foo</workspace>
+  <hudsonVersion>1.376</hudsonVersion>
+</build>
diff --git a/...ins/copyartifact/CopyArtifactTest/testPermissionWhenParameterized/jobs/testJob/config.xml b/...ins/copyartifact/CopyArtifactTest/testPermissionWhenParameterized/jobs/testJob/config.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <properties>
+    <hudson.security.AuthorizationMatrixProperty>
+      <useProjectSecurity>true</useProjectSecurity>
+      <permission>hudson.model.Item.Read:joe</permission>
+    </hudson.security.AuthorizationMatrixProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <jdk>(Default)</jdk>
+  <triggers class="vector"/>
+  <builders/>
+  <publishers/>
+  <buildWrappers/>
+</project>
diff --git a/...testPermissionWhenParameterized/jobs/testJob2/builds/2011-02-01_13-00-00/archive/foo2.txt b/...testPermissionWhenParameterized/jobs/testJob2/builds/2011-02-01_13-00-00/archive/foo2.txt
@@ -0,0 +1 @@
+bar
diff --git a/...ctTest/testPermissionWhenParameterized/jobs/testJob2/builds/2011-02-01_13-00-00/build.xml b/...ctTest/testPermissionWhenParameterized/jobs/testJob2/builds/2011-02-01_13-00-00/build.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<build>
+  <actions/>
+  <number>1</number>
+  <result>SUCCESS</result>
+  <duration>54321</duration>
+  <charset>UTF-8</charset>
+  <keepLog>false</keepLog>
+  <builtOn>master</builtOn>
+  <workspace>/tmp/foo</workspace>
+  <hudsonVersion>1.376</hudsonVersion>
+</build>
diff --git a/...ns/copyartifact/CopyArtifactTest/testPermissionWhenParameterized/jobs/testJob2/config.xml b/...ns/copyartifact/CopyArtifactTest/testPermissionWhenParameterized/jobs/testJob2/config.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <properties>
+    <hudson.security.AuthorizationMatrixProperty>
+      <useProjectSecurity>true</useProjectSecurity>
+      <permission>hudson.model.Item.Read:authenticated</permission>
+    </hudson.security.AuthorizationMatrixProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <jdk>(Default)</jdk>
+  <triggers class="vector"/>
+  <builders/>
+  <publishers/>
+  <buildWrappers/>
+</project>
diff --git a/...lugins/copyartifact/CopyArtifactTest/testPermissionWhenParameterized/users/joe/config.xml b/...lugins/copyartifact/CopyArtifactTest/testPermissionWhenParameterized/users/joe/config.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<user>
+  <fullName>Joe</fullName>
+  <properties>
+    <hudson.security.HudsonPrivateSecurityRealm_-Details>
+      <passwordHash>EMXnkE:1434127ddaef0d8cc56535303b644ae94d874c40bce4ee0b53a76c2a58bd4d4a</passwordHash>
+    </hudson.security.HudsonPrivateSecurityRealm_-Details>
+  </properties>
+</user>
diff --git a/...s/copyartifact/CopyArtifactTest/testPermissionWhenParameterizedForMatrixConfig/config.xml b/...s/copyartifact/CopyArtifactTest/testPermissionWhenParameterizedForMatrixConfig/config.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson>
+  <version>1.376</version>
+  <numExecutors>1</numExecutors>
+  <mode>NORMAL</mode>
+  <useSecurity>true</useSecurity>
+  <authorizationStrategy class="hudson.security.ProjectMatrixAuthorizationStrategy">
+    <permission>hudson.model.Hudson.Administer:admin</permission>
+    <permission>hudson.model.Hudson.Read:anonymous</permission>
+  </authorizationStrategy>
+  <securityRealm class="hudson.security.HudsonPrivateSecurityRealm">
+    <disableSignup>true</disableSignup>
+  </securityRealm>
+  <jdks/>
+  <slaves/>
+  <quietPeriod>5</quietPeriod>
+</hudson>
diff --git a/...opyArtifactTest/testPermissionWhenParameterizedForMatrixConfig/jobs/testMatrix/config.xml b/...opyArtifactTest/testPermissionWhenParameterizedForMatrixConfig/jobs/testMatrix/config.xml
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.security.AuthorizationMatrixProperty>
+      <useProjectSecurity>true</useProjectSecurity>
+      <permission>hudson.model.Item.Read:anonymous</permission>
+    </hudson.security.AuthorizationMatrixProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <axes>
+    <hudson.matrix.TextAxis>
+      <name>FOO</name>
+      <values>
+        <string>foo</string>
+        <string>bar</string>
+      </values>
+    </hudson.matrix.TextAxis>
+  </axes>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>echo foo &gt; foo.txt</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*.txt</artifacts>
+      <latestOnly>false</latestOnly>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
+  <buildWrappers/>
+  <runSequentially>false</runSequentially>
+</matrix-project>
diff --git a/...ig/jobs/testMatrix/configurations/axis-FOO/foo/builds/2011-04-12_09-00-00/archive/foo.txt b/...ig/jobs/testMatrix/configurations/axis-FOO/foo/builds/2011-04-12_09-00-00/archive/foo.txt
@@ -0,0 +1 @@
+foo
diff --git a/...ixConfig/jobs/testMatrix/configurations/axis-FOO/foo/builds/2011-04-12_09-00-00/build.xml b/...ixConfig/jobs/testMatrix/configurations/axis-FOO/foo/builds/2011-04-12_09-00-00/build.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-run>
+  <actions/>
+  <number>1</number>
+  <result>SUCCESS</result>
+  <duration>365</duration>
+  <builtOn></builtOn>
+  <workspace>/jenkins/home/jobs/testMatrix/workspace/FOO/foo</workspace>
+  <hudsonVersion>1.398</hudsonVersion>
+  <scm class="hudson.scm.NullChangeLogParser"/>
+  <culprits/>
+</matrix-run>
diff --git a/...onWhenParameterizedForMatrixConfig/jobs/testMatrix/configurations/axis-FOO/foo/config.xml b/...onWhenParameterizedForMatrixConfig/jobs/testMatrix/configurations/axis-FOO/foo/config.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-config>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders/>
+  <publishers/>
+  <buildWrappers/>
+</matrix-config>