Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JENKINS-50303] Using XStream to serialize a JSONObject was never adv…
…isable and as of 2.102 is forbidden (#311) * [JENKINS-50303] Using XStream to serialize a JSONObject was never advisable and as of 2.102 is forbidden. * compatibleSinceVersion * Permit data migration from the old format _if_ you are running on 2.101 or earlier. * Oops, that did not even compile. * Verifying that restoring the old field does no harm in 2.102+ beyond a warning. * Mark slaveAttributes transient as a reminder that it is not to be serialized (though it may still be deserialized).
- Loading branch information
Showing
6 changed files
with
187 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| // Build the plugin using https://github.com/jenkins-infra/pipeline-library | ||
| buildPlugin() | ||
| buildPlugin(jenkinsVersions: [null, '2.107.1']) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
src/test/java/org/jenkinsci/plugins/mesos/MesosCloudTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright 2018 CloudBees, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.jenkinsci.plugins.mesos; | ||
|
|
||
| import hudson.XmlFile; | ||
| import hudson.model.Node; | ||
| import hudson.slaves.NodeProperty; | ||
| import java.io.File; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import jenkins.model.Jenkins; | ||
| import static org.hamcrest.Matchers.*; | ||
| import static org.junit.Assert.*; | ||
| import org.junit.Test; | ||
| import org.junit.Rule; | ||
| import org.jvnet.hudson.test.Issue; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
| import org.jvnet.hudson.test.recipes.LocalData; | ||
|
|
||
| public class MesosCloudTest { | ||
|
|
||
| @Rule | ||
| public JenkinsRule r = new JenkinsRule(); | ||
|
|
||
| @Issue("JENKINS-50303") | ||
| @Test | ||
| public void configRoundtrip() throws Exception { | ||
| String slaveAttributes = "{\"somekey\":\"somevalue\"}"; | ||
| MesosCloud cloud = new MesosCloud( | ||
| "<nativeLibraryPath>", "<master>", "<description>", "<frameworkName>", "<role>", "<slavesUser>", "", "<principal>", /* TODO why is secret still in the DBC?? */null, | ||
| Collections.singletonList(new MesosSlaveInfo("<labelString>", Node.Mode.NORMAL, "4", "1024", "1", "1", "1", "0.0", "1024", "<remoteFSRoot>", "1", slaveAttributes, "<jvmArgs>", "<jnlpArgs>", "<defaultSlave>", | ||
| new MesosSlaveInfo.ContainerInfo(/* not actually used, should really be using f:optionalProperty */"DOCKER", "<dockerImage>", true, true, true, true, "<customDockerCommandShell>", | ||
| Collections.singletonList(new MesosSlaveInfo.Volume("<containerPath>", "<hostPath>", true)), | ||
| Collections.singletonList(new MesosSlaveInfo.Parameter("<key>", "<value>")), | ||
| "BRIDGE", | ||
| Collections.singletonList(new MesosSlaveInfo.PortMapping(23, 46, "udp")), | ||
| Collections.singletonList(new MesosSlaveInfo.NetworkInfo("<networkName>"))), | ||
| Collections.singletonList(new MesosSlaveInfo.URI("<value>", true, true)), | ||
| Collections.<NodeProperty<?>>emptyList())), | ||
| true, true, "<jenkinsURL>", "1234", "<cloudID>"); | ||
| r.jenkins.clouds.add(cloud); | ||
| r.configRoundtrip(); | ||
| r.assertEqualDataBoundBeans(Collections.singletonList(cloud), r.jenkins.clouds); | ||
| assertThat(new XmlFile(Jenkins.XSTREAM, new File(r.jenkins.root, "config.xml")).asString(), containsString(slaveAttributes.replace("\"", """))); | ||
| } | ||
|
|
||
| @Issue("JENKINS-50303") | ||
| @LocalData | ||
| @Test | ||
| public void oldData() throws Exception { | ||
| assertEquals(1, r.jenkins.clouds.size()); | ||
| List<MesosSlaveInfo> slaveInfos = ((MesosCloud) r.jenkins.clouds.get(0)).getSlaveInfos(); | ||
| assertEquals(1, slaveInfos.size()); | ||
| assertThat(String.valueOf(slaveInfos.get(0).getSlaveAttributes()), anyOf(is("{\"x\":\"y\"}"), is("null"))); | ||
| } | ||
|
|
||
| } |
88 changes: 88 additions & 0 deletions
88
src/test/resources/org/jenkinsci/plugins/mesos/MesosCloudTest/oldData/config.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <hudson> | ||
| <disabledAdministrativeMonitors/> | ||
| <version>2.7.3</version> | ||
| <numExecutors>2</numExecutors> | ||
| <mode>NORMAL</mode> | ||
| <useSecurity>true</useSecurity> | ||
| <authorizationStrategy class="hudson.security.AuthorizationStrategy$Unsecured"/> | ||
| <securityRealm class="hudson.security.SecurityRealm$None"/> | ||
| <disableRememberMe>false</disableRememberMe> | ||
| <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/> | ||
| <workspaceDir>${JENKINS_HOME}/workspace/${ITEM_FULLNAME}</workspaceDir> | ||
| <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir> | ||
| <jdks/> | ||
| <viewsTabBar class="hudson.views.DefaultViewsTabBar"/> | ||
| <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/> | ||
| <clouds> | ||
| <org.jenkinsci.plugins.mesos.MesosCloud plugin="mesos@0.15.2-SNAPSHOT"> | ||
| <name>MesosCloud</name> | ||
| <nativeLibraryPath></nativeLibraryPath> | ||
| <master></master> | ||
| <description></description> | ||
| <frameworkName>Jenkins Scheduler</frameworkName> | ||
| <role>*</role> | ||
| <slavesUser></slavesUser> | ||
| <credentialsId></credentialsId> | ||
| <cloudID>79262570-adf9-40b3-b403-f68e8b1fbfa0</cloudID> | ||
| <checkpoint>false</checkpoint> | ||
| <onDemandRegistration>true</onDemandRegistration> | ||
| <jenkinsURL></jenkinsURL> | ||
| <declineOfferDuration>600000</declineOfferDuration> | ||
| <slaveInfos> | ||
| <org.jenkinsci.plugins.mesos.MesosSlaveInfo> | ||
| <slaveCpus>0.1</slaveCpus> | ||
| <diskNeeded>0.0</diskNeeded> | ||
| <slaveMem>512</slaveMem> | ||
| <executorCpus>0.1</executorCpus> | ||
| <minExecutors>1</minExecutors> | ||
| <maxExecutors>2</maxExecutors> | ||
| <executorMem>128</executorMem> | ||
| <remoteFSRoot>jenkins</remoteFSRoot> | ||
| <idleTerminationMinutes>3</idleTerminationMinutes> | ||
| <jvmArgs>-Xms16m -XX:+UseConcMarkSweepGC -Djava.net.preferIPv4Stack=true</jvmArgs> | ||
| <jnlpArgs>-noReconnect</jnlpArgs> | ||
| <defaultSlave>false</defaultSlave> | ||
| <slaveAttributes> | ||
| <nullObject>false</nullObject> | ||
| <properties class="org.apache.commons.collections.map.ListOrderedMap" serialization="custom"> | ||
| <unserializable-parents/> | ||
| <org.apache.commons.collections.map.ListOrderedMap> | ||
| <default> | ||
| <insertOrder> | ||
| <string>x</string> | ||
| </insertOrder> | ||
| </default> | ||
| <map> | ||
| <entry> | ||
| <string>x</string> | ||
| <string>y</string> | ||
| </entry> | ||
| </map> | ||
| </org.apache.commons.collections.map.ListOrderedMap> | ||
| </properties> | ||
| </slaveAttributes> | ||
| <mode>NORMAL</mode> | ||
| <nodeProperties/> | ||
| <labelString>mesos</labelString> | ||
| </org.jenkinsci.plugins.mesos.MesosSlaveInfo> | ||
| </slaveInfos> | ||
| </org.jenkinsci.plugins.mesos.MesosCloud> | ||
| </clouds> | ||
| <quietPeriod>5</quietPeriod> | ||
| <scmCheckoutRetryCount>0</scmCheckoutRetryCount> | ||
| <views> | ||
| <hudson.model.AllView> | ||
| <owner class="hudson" reference="../../.."/> | ||
| <name>All</name> | ||
| <filterExecutors>false</filterExecutors> | ||
| <filterQueue>false</filterQueue> | ||
| <properties class="hudson.model.View$PropertyList"/> | ||
| </hudson.model.AllView> | ||
| </views> | ||
| <primaryView>All</primaryView> | ||
| <slaveAgentPort>0</slaveAgentPort> | ||
| <label></label> | ||
| <nodeProperties/> | ||
| <globalNodeProperties/> | ||
| </hudson> |